I think the solution for the first issue is fairly straight-forward - make is so that you have to realize capital gains when using stocks and other securities as collateral. The second one would either be applying capital gains taxes before stepping up. Both of these seem fairly common sense fixes to the loopholes, so it’s safe to assume they won’t happen without a major political shift.