Fixing minor issues with the build system