Log and message tweak