Fixup logging