Lab3 fixes