Lab 3 fixes