Merge NVG fixes