Fix compilation errors left from merge.