Fixes for the display