Couple display fixes