diff --git a/components/codetools/h2pastool.pas b/components/codetools/h2pastool.pas
index 34733de781..71fd10620a 100644
--- a/components/codetools/h2pastool.pas
+++ b/components/codetools/h2pastool.pas
@@ -528,7 +528,7 @@ begin
               dec(ConstantNumber)
             else
               ConstantNumber:=0;
-            ConstantCode:=IntToStr(ConstantNumber-1);
+            ConstantCode:=IntToStr(ConstantNumber);
           end else begin
             ConstantCode:=ConstantCode+'-1';
           end;
diff --git a/components/codetools/nonpascalcodetools.pas b/components/codetools/nonpascalcodetools.pas
index 8d4d2203f4..824ac0b82b 100644
--- a/components/codetools/nonpascalcodetools.pas
+++ b/components/codetools/nonpascalcodetools.pas
@@ -361,6 +361,7 @@ begin
     if p>0 then exit;
     try
       i:=StrToInt64(s);
+      Result:=true;
     except
     end;
   end;