Fixed push errors part 2