More refactor fixes.