Fixes to imports for R-devel