Changes to the pickling process to support better execution of pickled solvers