Fix some minor issues with Travis