X-ray and network bug fixes