Fixes of NPEs