Fix more NULL derefs