Resolve VFC code and swagger inconsistencies