Corrections from previous merge