Message fixes

I hope this works...