Fix coder review issues