COMP: Optimize fixup time