More nullability fixes