diff --git a/gradle.properties b/gradle.properties
index 07db5e27bf0..8ab3c48a623 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,7 @@
 org.gradle.jvmargs=-Duser.country=US -Dfile.encoding=UTF-8 -Dorg.gradle.internal.publish.checksums.insecure=true
 kotlin.daemon.jvmargs=-Xmx3g
+systemProp.file.encoding=UTF-8
+systemProp.user.country=US
 # Enable new incremental compiation
 kotlin.incremental.useClasspathSnapshot=true
 
diff --git a/libraries/stdlib/js/src/kotlin/text/char.kt b/libraries/stdlib/js/src/kotlin/text/char.kt
index 76b8ed68138..deec03b7d2d 100644
--- a/libraries/stdlib/js/src/kotlin/text/char.kt
+++ b/libraries/stdlib/js/src/kotlin/text/char.kt
@@ -71,7 +71,7 @@ public actual fun Char.uppercaseChar(): Char {
  *
  * This function supports one-to-many character mapping, thus the length of the returned string can be greater than one.
  * For example, `'\uFB00'.uppercase()` returns `"\u0046\u0046"`,
- * where `'\uFB00'` is the LATIN SMALL LIGATURE FF character.
+ * where `'\uFB00'` is the LATIN SMALL LIGATURE FF character (`ff`).
  * If this character has no upper case mapping, the result of `toString()` of this char is returned.
  *
  * @sample samples.text.Chars.uppercase