Fixed build system to work much better.