spork fixes