OOIION-1789: Enhances AgentControl script and small preload fixes