Fix option ref chicken-and-egg problem
Fix xrefs in option type field