A couple of tweaks for what we display