Fixed 2 messages