Fixes to lab 0