Some fixes for messages