Improve logging for GH-190 @wip