Fixed pickle update bugs for migration and scaling