Tidied up OSD a bit.