Fix code review feedback on isNhEnabled