Improve logging slightly