Task 1 fixes