Corrected a few lines that shouldn't have been automerged.