GDT/IDT: Some changes