Fixed up the build system a bit.