Sorry about all the jenkins related fixes.