Assorted message fixes and improvements