diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index cd2e2af63c771..2ea090ced34bb 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -25,7 +25,7 @@ Examples of unacceptable behavior by participants include:
 * The use of sexualized language or imagery and unwelcome sexual attention or
 advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
+* Public or private harassment/threats
 * Publishing others' private information, such as a physical or electronic
   address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
diff --git a/FEATURES.md b/FEATURES.md
index 381c09a0baf02..e6b29b3f86d9f 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -8,7 +8,7 @@
   - SAML
   - LDAP
   - CAS (1.0, 2.0 + attribute sync)
-  - Facebook, Github, Google, etc.
+  - Facebook, Github, Google talk, etc.
 - I18N: More than 30 languages so far
 - File Uploading
   - Drag-and-drop