More fixes for Jenkins.