Fixing display bugs reported