Reapply fixups