Fix more review comments I missed