Modifications to accomodate R-devel checks