Fix coder-review issues