More idg fixes