Fixes to Lab 2