Fixes to travis