Persistence subsystem bugs fixed.
Persistence subsystem bugs fixed.