Minor changes to ensure a clean build.