Fix a few Jenkins issues