Some tweaks to the agent startup.