Improvement in client logs at shutdown