Minor improvement and server proxy support