Fixup a thousand things