More null fixes. Not done yet.