Fix vc push/pop refresh issues