several osd fixes