Changed defines for _NOWASD stuff. AGAIN!