diff --git a/addons/xterm-addon-serialize/src/SerializeAddon.ts b/addons/xterm-addon-serialize/src/SerializeAddon.ts
index 3da4ce9b..b7cb00a9 100644
--- a/addons/xterm-addon-serialize/src/SerializeAddon.ts
+++ b/addons/xterm-addon-serialize/src/SerializeAddon.ts
@@ -546,7 +546,7 @@ export class HTMLSerializeHandler extends BaseSerializeHandler {
 
   private _padStart(target: string, targetLength: number, padString: string): string {
     targetLength = targetLength >> 0;
-    padString = String(typeof padString !== 'undefined' ? padString : ' ');
+    padString = padString ?? ' ';
     if (target.length > targetLength) {
       return target;
     }
@@ -587,9 +587,9 @@ export class HTMLSerializeHandler extends BaseSerializeHandler {
     const color = isFg ? cell.getFgColor() : cell.getBgColor();
     if (isFg ? cell.isFgRGB() : cell.isBgRGB()) {
       const rgb = [
-        color >>> 0xFF0000 & 255,
-        color >>> 0xFF00 & 255,
-        color & 255
+        (color >> 16) & 255,
+        (color >>  8) & 255,
+        (color      ) & 255
       ];
       return rgb.map(x => this._padStart(x.toString(16), 2, '0')).join('');
     }
diff --git a/demo/client.ts b/demo/client.ts
index 81309c7b..e6b2d385 100644
--- a/demo/client.ts
+++ b/demo/client.ts
@@ -461,8 +461,7 @@ function htmlSerializeButtonHandler(): void {
   document.addEventListener("copy", listener);
   document.execCommand("copy");
   document.removeEventListener("copy", listener);
-  document.getElementById("htmlserialize-output-result").innerText
-            = "Copied to clipboard";
+  document.getElementById("htmlserialize-output-result").innerText = "Copied to clipboard";
 }