Fix travis failures for 2.2