Week2 fixes