Fixing broken R class references