Updates to Guard/Spork