Format and messages fix