Fixing travis test failures.