12.13.13 I lied, more fixes for CRAN