Add nonce field.  Add explicit sizes.