Fixes compilation errors introduced with RedDeer refactoring