Minor changes to build.