Fixes for future CRAN releases