Additional changes to handle CRAN R2admb version