HCOLL-121 fixed some compilation issues.