Fix more review issues
Fix more review issues