A few R changes