some more focus in object tree fixes