khash usage fixes