HashTable fixes for pre-processor DEBUG