Fixes for jenkins with new setup.