Fix compile errors from previous merge