Fix travis failures.