More display fixes