Actually fix travis build problems