Regarding the one-leg companion upgrade: Does it work when you're on different itineraries, but share the same final leg? Could the upgrade be used on that final leg?
Example:
GS: ORD - LHR - ORD (J)
Non-GS: SFO - LHR - ORD (V)

Could the companion upgrade be used on LHR-ORD?