More Fixes for messages