* Fixing compilation issues in NPL