More fixes for /R