Fix remaining WORD / UWORD issues