Fixed the build system .. just a little bit, not more than enough.