Fixed wint_t type detection again