Make travis builds pass