Fix messaging
Fix the things