More build fixes for Jenkins.