Fix errors part 2