Fixes for structures

Hi

Small issues to fix.