Comm: Fixed compilation issues