Fix some minor stash update bugs