Some more Message fixes