make log fixup more generic on failures