Fix travis test errors