More nullptr cleanup