ADG: corrected g-ir-scanner warnings where possible