Fixed errors in CMS associated with new database scheme.