Added missing strings from merge