Fixes to use the Cast V2 protocol