Remove two fixup calls; we suspect they are unnecessary