More data persistence fixes