Rbvre Patches

Fun patches to run with RBVR Enhanced