Fixed hashtable related errors