Lab1 and 2 fixes

Minor stuff