Some Jenkins CI fixes

[ci:skip]