Improve logging again