Fix Server references