More review comments. Fix concurrency issue.