More tweaks to default AGF messages