Fixed compilation failures

Fixed compilation failures