Small updates to be log parser friendly