More fixes for V&R