Fixup multiple outputs