Fixing up Outfeed and Spooler classes.