Changes to get spores-pickling compiling (still need to get tests passing though!)