Improved logging to avoid clustered/broken logging