Fix messages from parser