Fix build for latest refactoring