Nullability fixes.