Fix refactor errors