More Jenkins fixes