fix several nits with struct compatibility