3.8: display fixes

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>