Bug fixes and a few optimistic UI updates.