Fix travis failures