Fix messages more