Some more modifications (use Makevars.site as I have multiple R installations)