remote-server: fix svace issues