Some fixes for the build slaves