Tweaking code to fix errors from Travis CI.