Minor changes to AgentControl!