small structures fix