Add files missing from previous merge