changed field types in some structures to equivalent unambiguous types