Fixed compilation issues - TRUNK-4402