Fix more NPEs