Quite janky display issue fixes