Fix refactor changes