Compile fixes after merge.