Fix xhr requests