Small fixes in persistence module after code review