Hierarchy editor: Final fixes and cleanups