Fixed issues from coder