Micro AIs: minor changes to messages for consistency with trunk versions