More agent tweaks