Add OXM_* mask field
Fix OXM_* field value