Changes to get s2s stuff working
Merge of Utter's latest stuff.