Fixed compilation issues due to changes in other projects