Some more tweaks for jenkins