a few logging cleanups