Fixes to gag warnings ...