Fix and squash OMX patch