Fixes needed to get our Jenkins job running