Small changes in HTreeMap