more osd fixes