Some fixes to travis