Fixes for OSD