Bug fixes when loading persistence
Improving cut out job