Some work on OMF workaround