Update bugs and fixes