Trying to fix the build system