multi tree management bug fixes part 1