Correct some errors due to push