Improve logging, no functional change