Fix a couple display bugs