Fix more issues caused by the merge