Small changes to accommodate changes in CVS tempo2