Adding additional fixes to lab2