Improve logging for #88