diff --git a/src/components/Button/component.tsx b/src/components/Button/component.tsx
index 8f44c052..c58e5d19 100644
--- a/src/components/Button/component.tsx
+++ b/src/components/Button/component.tsx
@@ -11,7 +11,6 @@ class Button extends Element<ButtonArgs, any> {
     static ctor = ButtonClass;
 
     render() {
-        // @ts-expect-error
         return <button ref={this.attachElement} />;
     }
 }
diff --git a/src/components/Canvas/component.tsx b/src/components/Canvas/component.tsx
index f8029847..8e57ef67 100644
--- a/src/components/Canvas/component.tsx
+++ b/src/components/Canvas/component.tsx
@@ -11,7 +11,6 @@ class Canvas extends Element<CanvasArgs, any> {
     static ctor = CanvasClass;
 
     render() {
-        // @ts-expect-error
         return <canvas ref={this.attachElement}/>;
     }
 }
diff --git a/src/components/ColorPicker/component.tsx b/src/components/ColorPicker/component.tsx
index 8328a9ed..e843e3ff 100644
--- a/src/components/ColorPicker/component.tsx
+++ b/src/components/ColorPicker/component.tsx
@@ -11,7 +11,6 @@ class ColorPicker extends Element<ColorPickerArgs, any> {
     static ctor = ColorPickerClass;
 
     render() {
-        // @ts-expect-error
         return <div ref={this.attachElement}/>;
     }
 }
diff --git a/src/components/ColorPicker/index.ts b/src/components/ColorPicker/index.ts
index 9d853e2b..045ededd 100644
--- a/src/components/ColorPicker/index.ts
+++ b/src/components/ColorPicker/index.ts
@@ -763,12 +763,11 @@ class ColorPicker extends Element implements IBindable {
     }
 
     /* eslint accessor-pairs: 0 */
-    set values(values: Array<number>) {
+    set values(values: Array<any>) {
         let different = false;
         const value = values[0];
         for (let i = 1; i < values.length; i++) {
             if (Array.isArray(value)) {
-                // @ts-expect-error
                 const other: number[] = values[i];
                 if (!Array.isArray(other) || value.length !== other.length ||
                     value.some((v, j) => v !== other[j])) {
@@ -787,7 +786,6 @@ class ColorPicker extends Element implements IBindable {
             this.value = null;
             this.class.add(CLASS_MULTIPLE_VALUES);
         } else {
-            // @ts-expect-error
             this.value = values[0];
         }
     }
diff --git a/src/components/Container/component.tsx b/src/components/Container/component.tsx
index eac61273..3a8492f7 100644
--- a/src/components/Container/component.tsx
+++ b/src/components/Container/component.tsx
@@ -45,7 +45,6 @@ class Container extends Element<ContainerArgs, any> {
             );
         }
 
-        // @ts-expect-error
         return <div ref={this.attachElement}>
             { elements }
         </div>;
diff --git a/src/components/Element/component.tsx b/src/components/Element/component.tsx
index 18298c74..03dc711c 100644
--- a/src/components/Element/component.tsx
+++ b/src/components/Element/component.tsx
@@ -42,7 +42,7 @@ class Element<P extends ElementArgs, S> extends React.Component<P, S> {
         }
     }
 
-    attachElement = (nodeElement: HTMLElement, containerElement: any) => {
+    attachElement = (nodeElement: HTMLElement | SVGElement | null, containerElement?: any) => {
         if (!nodeElement) return;
 
         this.element = new this.elementClass({
@@ -124,7 +124,6 @@ class Element<P extends ElementArgs, S> extends React.Component<P, S> {
     }
 
     render() {
-        // @ts-expect-error
         return <div ref={this.attachElement} />;
     }
 }
diff --git a/src/components/GradientPicker/component.tsx b/src/components/GradientPicker/component.tsx
index 64e284a3..3deab4a0 100644
--- a/src/components/GradientPicker/component.tsx
+++ b/src/components/GradientPicker/component.tsx
@@ -11,7 +11,6 @@ class GradientPicker extends Element<GradientPickerArgs, any> {
     static ctor = GradientPickerClass;
 
     render() {
-        // @ts-expect-error
         return <div ref={this.attachElement}/>;
     }
 }
diff --git a/src/components/GradientPicker/index.ts b/src/components/GradientPicker/index.ts
index d56e21c2..d5992f6d 100644
--- a/src/components/GradientPicker/index.ts
+++ b/src/components/GradientPicker/index.ts
@@ -1376,7 +1376,7 @@ class GradientPicker extends Element {
         }
 
         // store the curve type
-        const comboItems = {
+        const comboItems: Record<number, string> = {
             0: 'Step',
             1: 'Linear',
             2: 'Spline'
@@ -1396,7 +1396,6 @@ class GradientPicker extends Element {
         if (value[0].type !== CURVE_STEP &&
             value[0].type !== CURVE_LINEAR &&
             value[0].type !== CURVE_SPLINE) {
-            // @ts-expect-error
             comboItems[3] = 'Legacy';
             this.STATE.typeMap[3] = value[0].type;
         }
diff --git a/src/components/InfoBox/component.tsx b/src/components/InfoBox/component.tsx
index 2192f94a..90bcbbe5 100644
--- a/src/components/InfoBox/component.tsx
+++ b/src/components/InfoBox/component.tsx
@@ -11,7 +11,6 @@ class InfoBox extends Element<InfoBoxArgs, any> {
     static ctor = InfoBoxClass;
 
     render() {
-        // @ts-expect-error
         return <span ref={this.attachElement} />;
     }
 }
diff --git a/src/components/Label/component.tsx b/src/components/Label/component.tsx
index 032dbb9d..fe5bfbfe 100644
--- a/src/components/Label/component.tsx
+++ b/src/components/Label/component.tsx
@@ -11,7 +11,6 @@ class Label extends Element<LabelArgs, any> {
     static ctor = LabelClass;
 
     render() {
-        // @ts-expect-error
         return <span ref={this.attachElement} />;
     }
 }
diff --git a/src/components/LabelGroup/component.tsx b/src/components/LabelGroup/component.tsx
index 25ee0492..2451795a 100644
--- a/src/components/LabelGroup/component.tsx
+++ b/src/components/LabelGroup/component.tsx
@@ -19,7 +19,7 @@ interface LabelGroupChildProps {
 class LabelGroup extends Element<LabelGroupArgs, any> {
     static ctor = LabelGroupClass;
 
-    attachElement = (nodeElement: HTMLElement, containerElement: any) => {
+    attachElement = (nodeElement: HTMLElement | SVGElement | null, containerElement?: any) => {
         if (!nodeElement) return;
         const childrenErrorMessage = 'A LabelGroup must contain a single PCUI react component as a child';
         // check that the LabelGroup has a single child
diff --git a/src/components/Spinner/component.tsx b/src/components/Spinner/component.tsx
index 0dda7d7d..040ef349 100644
--- a/src/components/Spinner/component.tsx
+++ b/src/components/Spinner/component.tsx
@@ -11,7 +11,6 @@ class Spinner extends Element<SpinnerArgs, any> {
     static ctor = SpinnerClass;
 
     render() {
-        // @ts-expect-error
         return <svg ref={this.attachElement} />;
     }
 }