HCOLL-160 fixes after the prev commit