Minor tweaks to build.