fixes for NPEs