fix _resolveXri timeout and add extra logging