Correction(s) to the prev merge