Some more logging cleanups