Some more (minor) logging fixes.