Fixed errors part 3.