Fix stale display bugs

I've cherry picked a couple of small (and hopefully uncontroversial) bug fixes from #2