Updating code to debug failing Travis CI