fix some structures