Fix issues introduced by rebase