fixed some persistenve issues