Minor changes

Updates to make the package CRAN compatible