some fixes to support virtual-anvil repair operations