Fixes for proper RData path