Interconnect: Workaround broken cookies, minor fixes.