Fixing more display issues