More fixes to translation to FastR