Fixed compilation errors from merge.