Finish refactoring that caused build error