- bugfixes for persistence