Fix compilation errors after merge