More fixes around bug 9356 : more reference counts were missing leading again to double deletion