Some modifications to Hawk token nonce verification code, more is needed