fix bugs after updates