Updates to make the package build and install properly in R.