Fix more errors from rebase