My old HP 3577A box does not allow for proper full 2-port calibration. So I investigated a bit in this field.
The document attached is actually quite old, but recently I visited the course about VNA measurements at METAS, (which was awesome BTW) and this remembered me of the document I wrote.
It also covers conversion of port impedances and other stuff. I plan to provide soon an example, using my homemade calibration kits (this and that).