Fixed compilation issues after merge