Fixes for OMX