[NGRINDER-694] Fix messages