Some fixes to travis config