Fixing build system to not be QUITE so silly