Minor enhancements to OSD annotation
OSD externs tweak