more  fixes to s2s