Fixes for structures

Small fixes for small issues.