Last fixes for CRAN release...?