Updates to fix test failures.