Some fixes for iv stab