Fix compilation errors caused by rebase