Some improvements to the OSD.