RClassNamePair fixes