Correct some update bugs