Persistance fixes