fix(logger) small logger fixes

Some stuff pulled out of #1992, and a fix for #1865.