Bug fixes, especially those dealing with XHR errors