diff --git a/packages/fcl-json/src/fpjson.pp b/packages/fcl-json/src/fpjson.pp
index 4ab8600b61..e4647f9733 100644
--- a/packages/fcl-json/src/fpjson.pp
+++ b/packages/fcl-json/src/fpjson.pp
@@ -3183,7 +3183,11 @@ begin
       DoError(SErrNameMustBeString,[I+1]);
     Inc(I);
     J:=VarRecToJSON(Elements[i],'Object');
+    {$IFDEF FPC_HAS_CPSTRING}
     Add(UTF8Encode(AName),J);
+    {$ELSE}
+    Add(AName,J);
+    {$ENDIF}
     Inc(I);
     end;
 end;
diff --git a/packages/pastojs/src/fppas2js.pp b/packages/pastojs/src/fppas2js.pp
index e64c6b2226..29e75a32ef 100644
--- a/packages/pastojs/src/fppas2js.pp
+++ b/packages/pastojs/src/fppas2js.pp
@@ -12973,7 +12973,6 @@ begin
           else if (C=TPasClassConstructor)
               or (C=TPasClassDestructor) then
             begin
-//              writeln('FFF2 TPasToJSConverter.ConvertClassType ',GetObjName(P));
             AddGlobalClassMethod(AContext,TPasProcedure(P));
             continue;
             end;
@@ -15691,7 +15690,6 @@ begin
   First:=nil;
   Last:=nil;
   try
-//    writeln('FFF1 TPasToJSConverter.AddClassConstructors ',length(RootContext.GlobalClassMethods));
     for i:=0 to length(RootContext.GlobalClassMethods)-1 do
       begin
       Proc:=RootContext.GlobalClassMethods[i];