Fixes for polling XHR clients