Bug fixes for continued work after grading