diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9ac86602aa..c4a0b2cd5b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-02-12 16:32 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbhttpd/core.prg
+    * explicitly set HKEEPORDER to not depend on default setting
+
+  * contrib/xhb/hbdll.ch
+    % replaced huge CASE statment with one-liner. also fixing 
+      typo in CASE statement. UNTESTED.
+
 2012-02-09 13:49 UTC+0100 Viktor Szakats (harbour syenar.net)
   * src/rtl/hbjson.c
     + HB_JSONDECODE(): retain physical order of value pair in returned hash
diff --git a/harbour/contrib/hbhttpd/core.prg b/harbour/contrib/hbhttpd/core.prg
index d677fdcb9c..243d684af4 100644
--- a/harbour/contrib/hbhttpd/core.prg
+++ b/harbour/contrib/hbhttpd/core.prg
@@ -235,6 +235,7 @@ STATIC FUNCTION ParseFirewallFilter( cFilter, aFilter )
    LOCAL cExpr, nI, cI, nPrefix, nAddr, nAddr2, nPos, nPos2, lDeny, aDeny, aI
 
    aFilter := { => }
+   hb_HKeepOrder( aFilter, .F. )
    aDeny := {}
    FOR EACH cExpr IN hb_ATokens( cFilter, " " )
       IF ! Empty( cExpr )
diff --git a/harbour/contrib/xhb/hbdll.ch b/harbour/contrib/xhb/hbdll.ch
index d693be8227..0c7aa06126 100644
--- a/harbour/contrib/xhb/hbdll.ch
+++ b/harbour/contrib/xhb/hbdll.ch
@@ -124,29 +124,7 @@
              IF t_cTemplate == NIL;;
                 t_cTemplate := DllPrepareCall( <(DllName)>, DC_CALL_STD, iif( <.DllFuncName.>, <(DllFuncName)>, #<FuncName> ) );;
              end;;
-             SWITCH PCount();;
-             CASE 0;;
-                RETURN DllExecuteCall( t_cTemplate );;
-             CASE 1;;
-                RETURN DllExecuteCall( t_cTemplate, ...) );;
-             CASE 2;;
-                RETURN DllExecuteCall( t_cTemplate, hb_PValue(1), hb_PValue(2) );;
-             CASE 3;;
-                RETURN DllExecuteCall( t_cTemplate, hb_PValue(1), hb_PValue(2), hb_PValue(3) );;
-             CASE 4;;
-                RETURN DllExecuteCall( t_cTemplate, hb_PValue(1), hb_PValue(2), hb_PValue(3), hb_PValue(4) );;
-             CASE 5;;
-                RETURN DllExecuteCall( t_cTemplate, hb_PValue(1), hb_PValue(2), hb_PValue(3), hb_PValue(4), hb_PValue(5) );;
-             CASE 6;;
-                RETURN DllExecuteCall( t_cTemplate, hb_PValue(1), hb_PValue(2), hb_PValue(3), hb_PValue(4), hb_PValue(5), hb_PValue(6) );;
-             CASE 7;;
-                RETURN DllExecuteCall( t_cTemplate, hb_PValue(1), hb_PValue(2), hb_PValue(3), hb_PValue(4), hb_PValue(5), hb_PValue(6), hb_PValue(7) );;
-             CASE 8;;
-                RETURN DllExecuteCall( t_cTemplate, hb_PValue(1), hb_PValue(2), hb_PValue(3), hb_PValue(4), hb_PValue(5), hb_PValue(6), hb_PValue(7), hb_PValue(8) );;
-             CASE 9;;
-                RETURN DllExecuteCall( t_cTemplate, hb_PValue(1), hb_PValue(2), hb_PValue(3), hb_PValue(4), hb_PValue(5), hb_PValue(6), hb_PValue(7), hb_PValue(8), hb_PValue(9) );;
-             end;;
-          RETURN NIL
+          RETURN DllExecuteCall( t_cTemplate, ... )
 
       // FWH
       #xcommand DLL [<Qualifier: STATIC>] FUNCTION <FuncName>( [ <ArgName> AS <ArgType> ] [, <ArgNameN> AS <ArgTypeN> ] ) AS <Type> [<Pascal: PASCAL>] [ FROM <DllFuncName> ] LIB <(DllName)> => ;