Move RClass annotations.
Fix shuffle annotation