VRF fixes

Still in progress.