More updates to get this thing working with Jenkins.