Some fixes to jenkins script