Fixes in task 1