A few tweaks to generalize the build process and get things working.