Fix clone() methods in Hierarchy implementations