xr: Fixes, and additional cases in lin
xr: Fixes, and additional cases in lin

arlencox/SETr,xrival/QUICr,arlencox/SETr,xrival/QUICr,arlencox/QUICr,arlencox/SETr,arlencox/QUICr,arlencox/QUICr,xrival/QUICr