Further fixes to Travis script