Tweaks to agent behaviours