Fix issues with compiling main.cpp (except issues with new NVP)