Minor MINOR fixes to AgentController