diff --git a/compiler/cgobj.pas b/compiler/cgobj.pas
index bb0dd152cb..e404d60371 100644
--- a/compiler/cgobj.pas
+++ b/compiler/cgobj.pas
@@ -1288,10 +1288,10 @@ unit cgobj;
               both in stack and in self register.
             }
             { 2nd parameter  : flag }
-            a_param_const(list,OS_32,1,2);
+            a_param_const(list,OS_32,1,getintparaloc(2));
             { 1st parameter to destructor : self }
             reference_reset_base(href, procinfo^.framepointer,procinfo^.selfpointer_offset);
-            a_param_ref(list, OS_ADDR,href,1);
+            a_param_ref(list, OS_ADDR,href,getintparaloc(1));
             a_call_name(list,'FPC_DISPOSE_CLASS');
             { SET SELF TO NIL }
             a_load_const_reg(list,OS_ADDR,0,SELF_POINTER_REG);
@@ -1344,8 +1344,8 @@ finalization
 end.
 {
   $Log$
-  Revision 1.34  2002-07-07 10:05:34  florian
-    * typo fixed
+  Revision 1.35  2002-07-07 10:16:29  florian
+    * problems with last commit fixed
 
   Revision 1.33  2002/07/07 09:52:32  florian
     * powerpc target fixed, very simple units can be compiled
diff --git a/compiler/ncgset.pas b/compiler/ncgset.pas
index c8886405cb..a0b152aafa 100644
--- a/compiler/ncgset.pas
+++ b/compiler/ncgset.pas
@@ -55,6 +55,7 @@ implementation
       globtype,systems,
       verbose,globals,
       symconst,symdef,types,
+      cpupara,
       pass_2,
       ncon,
       cga,tgobj,ncgutil,regvars,rgobj;
@@ -561,8 +562,8 @@ implementation
                   cg.a_load_loc_reg(exprasmlist,left.location,pleftreg);
                   location_freetemp(exprasmlist,left.location);
                   location_release(exprasmlist,left.location);
-                  cg.a_param_reg(exprasmlist,OS_8,pleftreg,2);
-                  cg.a_param_ref(exprasmlist,OS_ADDR,right.location.reference,1);
+                  cg.a_param_reg(exprasmlist,OS_8,pleftreg,getintparaloc(2));
+                  cg.a_param_ref(exprasmlist,OS_ADDR,right.location.reference,getintparaloc(1));
                   cg.a_call_name(exprasmlist,'FPC_SET_IN_BYTE');
                   { result of value is always one full register }
                   cg.a_load_reg_reg(exprasmlist,OS_INT,ACCUMULATOR,location.register);
@@ -580,13 +581,14 @@ implementation
 
 begin
    csetelementnode:=tcgsetelementnode;
-{$ifdef TEST_GENERIC}
    cinnode:=tcginnode;
-{$endif}
 end.
 {
   $Log$
-  Revision 1.3  2002-07-06 20:19:25  carl
+  Revision 1.4  2002-07-07 10:16:29  florian
+    * problems with last commit fixed
+
+  Revision 1.3  2002/07/06 20:19:25  carl
   + generic set handling
 
   Revision 1.2  2002/07/01 16:23:53  peter