More hashtable finetuning