Nullability fixes