Improve logging some more