(RFC) Fix bugs in VFC-OOF interaction