Fix R6 classes