Hacking away at the build problems