Task 2 fixes.