S2S comms and threading protections better