Fix some review issues.