Fix more errors caused by the PR