More improvements prompted by hiccups in our migration

A few more minor patches for error logging and workarounds on API misbehavior.