fixes for messages