diff --git a/compiler/ncgflw.pas b/compiler/ncgflw.pas
index 70c42d7182..66a65e50eb 100644
--- a/compiler/ncgflw.pas
+++ b/compiler/ncgflw.pas
@@ -131,7 +131,7 @@ implementation
       fmodule,
       cpubase,
       tgobj,paramgr,
-      cgobj,hlcgobj,nutils
+      cgobj,hlcgobj,nutils,node
       ;
 
 {*****************************************************************************
@@ -512,8 +512,8 @@ implementation
     procedure tcglabelnode.pass_generate_code;
       begin
          location_reset(location,LOC_VOID,OS_NO);
-
-         include(flowcontrol,fc_gotolabel);
+         if not (nf_internal in flags) then
+           include(flowcontrol,fc_gotolabel);
 {$ifdef OLDREGVARS}
          load_all_regvars(current_asmdata.CurrAsmList);
 {$endif OLDREGVARS}
diff --git a/compiler/nflw.pas b/compiler/nflw.pas
index 3896810ce1..fc393f4d7c 100644
--- a/compiler/nflw.pas
+++ b/compiler/nflw.pas
@@ -2118,7 +2118,8 @@ implementation
         result:=nil;
         expectloc:=LOC_VOID;
 
-        include(current_procinfo.flags,pi_has_label);
+        if not (nf_internal in flags) then
+          include(current_procinfo.flags,pi_has_label);
 
         if assigned(labsym) and labsym.nonlocal then
           begin
@@ -2223,6 +2224,7 @@ implementation
               begin
                 third:=cinlinenode.create(in_get_frame,false,nil);
                 current_addr:=clabelnode.create(cnothingnode.create,clabelsym.create('$raiseaddr'));
+                current_addr.toggleflag(nf_internal);
                 addstatement(statements,current_addr);
                 right:=caddrnode.create(cloadnode.create(current_addr.labsym,current_addr.labsym.owner));
               end;
diff --git a/rtl/linux/ostypes.inc b/rtl/linux/ostypes.inc
index 204e275d09..1b27966e0f 100644
--- a/rtl/linux/ostypes.inc
+++ b/rtl/linux/ostypes.inc
@@ -75,14 +75,18 @@ TYPE
 { include /include/asm-<cpu>/posix-types.h                       }
 
 const
-{$ifndef cpux86_64}
+{$if not defined(cpux86_64) and not defined (cpuaarch64)}
   _STAT_VER_LINUX_OLD = 1;
   _STAT_VER_KERNEL = 1;
   _STAT_VER_SVR4 = 2;
   _STAT_VER_LINUX = 3;
 {$else}
   _STAT_VER_KERNEL = 0;
+{$if defined(cpuaarch64)}
+  _STAT_VER_LINUX = 0;
+{$else}
   _STAT_VER_LINUX = 1;
+{$endif}
 {$endif}
   _STAT_VER = _STAT_VER_LINUX;