Fixes according to HW6