Fix some minor stuff to make R CMD check happy