Minor fixes to clearwater-log-cleanup