Fix compiling after merge