Fix for a bunch of the IDE term tree defect tickets.