Updates to fix Travis CI tests.