Fix for compilation errors following the merge.