Fix some minor comment and code issues.
Fix merge