Fix 2.6 merge errors.