Fixes to Message System