- fix pickle issues