Some fixes for jenkins