Push fixes to this before I lose them - UI is flaky.