Fix Jenkins CI issues