better logging

Noticed these while looking at #3063 - not 100% sure I found the right places but this at least should be a strict improvement.