Fixup and logging