Fixed the build system helpers