fixes for some struct types