Improve logging a bit