fixes for R 3.0