Improve logging a bit.