server proxy improvements