Fix messages (hopefully)