Fixes StructureNode issues