Fix Travis test failures.