Fixed some orphan nodes