Fixes for 0.9.3 CRAN release.