JENKINS-18429 fixes