a few more fixes from recent logging refactor