AGENT-824: Fixes