HOTFIX: Several bugfixes on the object tree