Fixing up the build process a bit.