WIP: cleaning up R CMD check warnings