* Fixing various warning in NPS