OMX fixes by OliverG96