Fixes for agentcontrollerproxy