Changes to support cbreak's Invariant Disks