Group of changes for compiling on the build server