Fixes for structures
Merge pull request #238 from sakrist/master

Fixes for structures