Fix Jenkins CI problems