[3.8] Make log messages more understandable