Fixing simple update bugs