Fixing sameserver

fix trivial merge conflicts from #1275