fixes for substructure variables