Fixup STI a little.