Backport Fixes/Tweaks for VNRC