Fix compile errors resulting from merge