FORGE-1826: Fixed compilation errors