Fix latest merge errors