Messaging fixes & DRY