A few tweaks to be used by the agent.