htable fixes