Remove xray and improve some error messages

Just a few triage issues that I ran into.