Fix arc/mrc code