fixes to reflect the persistence interface changes