Fix some issues from conflict during rebase