Changes to get s2s stuff working