Some Fixes to Lab 6