Bugfixes in the persistent uuid map