Fixed a couple of warnings/notes from R CMD check