Misc fixes + hashtable