tweaks and fixes for easier proxy support