Patches to fix autograder errors. Not yet completed.