Fix more errors after code review