More XHR improvements