Fixes for structures