more s2s fixes