NAK and WM had the wrong codes assigned. Since both are NOPs, this wasn't allowing incorrrect behaviour, but needs to be corrected still. (cherry picked from commit ffefea92)
