fixes for ivf unpacking