minor persistence fixes