small fixes for NPEs