Make log messages more useful for troubleshooting