Merge fixes from build.