update ServerProxy for changes due issue/1898