diff --git a/std-bits/base/src/main/java/org/enso/base/Text_Utils.java b/std-bits/base/src/main/java/org/enso/base/Text_Utils.java
index 75e332fd4c..8f7b1a858f 100644
--- a/std-bits/base/src/main/java/org/enso/base/Text_Utils.java
+++ b/std-bits/base/src/main/java/org/enso/base/Text_Utils.java
@@ -170,8 +170,8 @@ public class Text_Utils {
   public static boolean contains(String string, String substring) {
     // {@code StringSearch} does not handle empty strings as we would want, so we need these special
     // cases.
-    if (substring.length() == 0) return true;
-    if (string.length() == 0) return false;
+    if (substring.isEmpty()) return true;
+    if (string.isEmpty()) return false;
     StringSearch searcher = new StringSearch(substring, string);
     return searcher.first() != StringSearch.DONE;
   }
diff --git a/std-bits/table/src/main/java/org/enso/table/format/csv/Parser.java b/std-bits/table/src/main/java/org/enso/table/format/csv/Parser.java
index 05e10b4920..bacd5c29ec 100644
--- a/std-bits/table/src/main/java/org/enso/table/format/csv/Parser.java
+++ b/std-bits/table/src/main/java/org/enso/table/format/csv/Parser.java
@@ -93,7 +93,7 @@ public class Parser {
   }
 
   private String handleNa(String raw) {
-    if (raw == null || raw.length() == 0) {
+    if (raw == null || raw.isEmpty()) {
       return null;
     }
     return raw;