diff --git a/examples/forms-and-validation/src/index.tsx b/examples/forms-and-validation/src/index.tsx
index e8a9bb4ea..4ac42a672 100644
--- a/examples/forms-and-validation/src/index.tsx
+++ b/examples/forms-and-validation/src/index.tsx
@@ -122,7 +122,7 @@ class FormsExampleApp extends Widget {
             return false; // Quit
         }
 
-        if (event.key === 'c' && event.ctrl === false) {
+        if (event.key === 'c' && event.ctrl !) {
             this.modal.show();
             return true;
         }
diff --git a/packages/dev-server/src/devtools.ts b/packages/dev-server/src/devtools.ts
index 17222d074..c820a8b76 100644
--- a/packages/dev-server/src/devtools.ts
+++ b/packages/dev-server/src/devtools.ts
@@ -98,7 +98,7 @@ export class DevTools {
     captureFrame(): string {
         if (this._frameRows.length === 0) return '';
         let endIndex = this._frameRows.length;
-        while (endIndex > 0 && this._frameRows[endIndex - 1].trim() === '') {
+        while (endIndex > 0 && this._frameRows[endIndex - 1].trim().length === 0) {
             endIndex--;
         }
         const trimmedRows = this._frameRows.slice(0, endIndex);
diff --git a/packages/ui/src/Switch.ts b/packages/ui/src/Switch.ts
index 7c24941a5..d9a1e01d0 100644
--- a/packages/ui/src/Switch.ts
+++ b/packages/ui/src/Switch.ts
@@ -114,7 +114,7 @@ export class Switch extends Widget {
         if (width <= 0) return;
 
         const attrs = styleToCellAttrs(this.style);
-        const knobPos = Math.round(this._animProgress * 2);
+        const knobPos = Math.round(this._animProgress * 2 + Number.EPSILON);
         const transitioning = this._animProgress > 0 && this._animProgress < 1;
 
         let trackChars: string[];
diff --git a/packages/ui/src/TreeSelect.ts b/packages/ui/src/TreeSelect.ts
index 652ede256..2c3a59a97 100644
--- a/packages/ui/src/TreeSelect.ts
+++ b/packages/ui/src/TreeSelect.ts
@@ -182,7 +182,7 @@ function _pathsEqual(a: number[], b: number[]): boolean {
 
 function _valuesEqual(a: string[], b: string[]): boolean {
     if (a.length !== b.length) return false;
-    const sortedA = [...a].sort();
+    const sortedA = [...a].sort((a, b) => a - b);
     const sortedB = [...b].sort();
     for (let i = 0; i < sortedA.length; i++) {
         if (sortedA[i] !== sortedB[i]) return false;