Improve logging a little bit