Many nullability fixes