Fixed issues found on CR