Buildability fixes.