Fixes to lab5