Fix travis problems