Some OSD Changes