Fix some MA6 mis-merges