More merge fix ups