Fix some merge leftovers