Fix broken refactor changes