Task 8 fixes