Fix persistent storage issues