Changes to better match V&R v2.102

Changes to better match V&R v2.102