Small cleanups to match current build process.