Fix remaining issues with hash_item