Fix bugs.
Apparently the pickle tricks wern't needed.