Clean up some issues in old build process.