Make travis build more robust