[CHORE] Fixing some issues with HashStorage (for persisting).