Fix refactor errors.