Some fixes for persistent2