NH-3683: Fixed compilation warnings