Some fixes to recently pushed SJOIN/JOIN s2s code