Address NexusIQ issues