Tweak logging messages to make it easier to debug (preparing peri-test-comp)