Fix compilation after rebase