MC: Simplify MCFixup and increase the available offset size.