Fix mistakes in dexmerge