IDT setup part 2/2, some fixes for silly things.