Structure build fixes
Structure build fixes