diff --git a/examples/showcase/src/index.tsx b/examples/showcase/src/index.tsx
index 444be6698..47a52a3e3 100644
--- a/examples/showcase/src/index.tsx
+++ b/examples/showcase/src/index.tsx
@@ -128,7 +128,7 @@ class ShowcaseApp extends Widget {
         if (event.key === 'q' || (event.ctrl && event.key === 'c')) return false;
 
         // Tab switching: 1-5
-        const num = parseInt(event.key);
+        const num = parseInt(event.key, 10);
         if (num >= 1 && num <= 5) {
             this.switchTab(num - 1);
             return true;
diff --git a/examples/widget-gallery/src/index.ts b/examples/widget-gallery/src/index.ts
index 57b141244..ec688a7fc 100644
--- a/examples/widget-gallery/src/index.ts
+++ b/examples/widget-gallery/src/index.ts
@@ -129,7 +129,7 @@ class WidgetGalleryApp extends Widget {
         }
 
         // Tab switching: 1-6
-        const num = parseInt(event.key);
+        const num = parseInt(event.key, 10);
         if (num >= 1 && num <= 6) {
             this._switchTab(num - 1);
             return true;
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;