Fix a couple issues in new zero log reporting