Fix a nasty bug with display initialisation