Some fixup