Fixed the build system