Fixes of task 2