Fix problem 2 and 3.