Fix issues from rebase