More useful debugging messages, this was enough to actually identify issues.

I think this is worth it in short term. Obviously not ideal, but I think it will help with debugging issues in general while we know things are not 100%.