Miscellaneous fixes for Osd