WIP - Fix N2VC integration issues