diff --git a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedMap.ts b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedMap.ts
index e2662b5fa1a76c037899e29eada06e77fa53e866..11358a1dda50fa444b257a258e9519d376b47168 100644
--- a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedMap.ts
+++ b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedMap.ts
@@ -118,7 +118,7 @@ export class WrappedMap<K, V> extends Map<K, V> implements IObservedObject, Obse
      * Returns number of Entries with unique keys in the Map
      * @returns number of Entries with unique keys in the Map
      */
-    public override get size(): number {
+    public override get size(): int {
         if (this.shouldAddRef()) {
             this.meta_.addRef(CONSTANT.OB_LENGTH);
         }
diff --git a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedSet.ts b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedSet.ts
index 34b640739f6d841ab6a4b0e70efb4813f2d81296..1966db4d35e9127a3ea444fc076a1bd603a2153c 100644
--- a/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedSet.ts
+++ b/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedSet.ts
@@ -118,7 +118,7 @@ export class WrappedSet<K> extends Set<K> implements IObservedObject, ObserveWra
      *
      * @returns number of unique elements in the Set
      */
-    public get size(): number {
+    public get size(): int {
         if (this.shouldAddRef()) {
             this.meta_.addRef(CONSTANT.OB_LENGTH);
         }
diff --git a/subset/arkoala/arkui/src/main.ts b/subset/arkoala/arkui/src/main.ts
index 068bafca8adc2de58d51ff63aa527f793b01acfa..44b376dd058dd270afdc4a17e7a9b98b3d10d8c0 100644
--- a/subset/arkoala/arkui/src/main.ts
+++ b/subset/arkoala/arkui/src/main.ts
@@ -26,7 +26,11 @@ import { ArkButtonPeer,
          ArkCommonMethodPeer,
 } from "@arkoala/arkui/generated"
 // Improve: It needs to be possible to use CanvasRenderingContext2D without import
-import { CanvasRenderingContext2D, CanvasRenderingContext2D_serializer, CanvasRenderingContext2DInternal } from "@arkoala/arkui/generated"
+import {
+    CanvasRenderingContext2D,
+    CanvasRenderingContext2DInternal,
+    arkui_component_canvas_CanvasRenderingContext2D_serializer as CanvasRenderingContext2D_serializer
+} from "@arkoala/arkui/generated"
 import { startPerformanceTest } from "@arkoala/arkui/test_performance"
 import { testLength_10_lpx } from "@arkoala/arkui/test_data"
 // imports required interfaces (now generation is disabled)