Fixing two NPEs