Fix error on Question 4 and 7