Fixed a few refactor errors.