Adjust VFC modules to latest