JBIDE-17657: Fixed compilation issues