Further fixes for cloudbees.