Make more objects pickleable