Persistance fixes...