Fix some issues from the rebase.