Persistent Storage: Minor fixes

segfaultrequested to merge
tps-minor-fixes into stable

Small fixes from Triage the follow-ups from "Rewrite the Persist... (#19215 - closed).

TODO:

  • Test manually
  • Check Jenkins
Edited by segfault

Merge request reports