[NGRINDER-690] Fix bugs