Fixes for issues found in refactor buddy testing.