Fix dependence problems on CRAN.