Re-did two variables whcih were causing travis to fail