Fix a few small display bugs