some minor changes in the library to make the pickled data more robust for transport