HCOLL-155 minor changes