Fixed top-level builds in build.