some bug fixes in V&R

some bug fixes in V&R. this should get automated tests running again