Compile fixes after merge