Tweaks to work with latest IQMon