CMS tree controller bugfixes