[No reviewer required] Fix exceptions caused by code review updates