Fixing a bunch of NPEs