Fix messages in map