Fix multi-server setup h/t @chrisseto
Merge branch 'multi'