Fixup fixtures