diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 52b7fbfc5..d3f70a4fc 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -136,9 +136,9 @@ public:
         consensus.nAllowMinDiffMaxHeight = -1;
         consensus.nNormalizedNameForkHeight = 539940; // targeting 21 March 2019
         consensus.nMinTakeoverWorkaroundHeight = 496850;
-        consensus.nMaxTakeoverWorkaroundHeight = 654400; // targeting 30 Oct 2019
-        consensus.nWitnessForkHeight = 676900; // targeting 11 Dec 2019
-        consensus.nAllClaimsInMerkleForkHeight = 654400; // targeting 30 Oct 2019
+        consensus.nMaxTakeoverWorkaroundHeight = 658300; // targeting 30 Oct 2019
+        consensus.nWitnessForkHeight = 680770; // targeting 11 Dec 2019
+        consensus.nAllClaimsInMerkleForkHeight = 658310; // targeting 30 Oct 2019
         consensus.fPowAllowMinDifficultyBlocks = false;
         consensus.fPowNoRetargeting = false;
         consensus.nRuleChangeActivationThreshold = 1916; // 95% of a  half week
@@ -247,9 +247,9 @@ public:
         consensus.nAllowMinDiffMaxHeight = 1100000;
         consensus.nNormalizedNameForkHeight = 993380;   // targeting, 21 Feb 2019
         consensus.nMinTakeoverWorkaroundHeight = 99;
-        consensus.nMaxTakeoverWorkaroundHeight = 1181920; // targeting 29 Sep 2019
-        consensus.nWitnessForkHeight = 1181950;
-        consensus.nAllClaimsInMerkleForkHeight = 1181920; // targeting 29 Sep 2019
+        consensus.nMaxTakeoverWorkaroundHeight = 1198550; // targeting 30 Sep 2019
+        consensus.nWitnessForkHeight = 1198600;
+        consensus.nAllClaimsInMerkleForkHeight = 1198560; // targeting 30 Sep 2019
         consensus.fPowAllowMinDifficultyBlocks = true;
         consensus.fPowNoRetargeting = false;
         consensus.nRuleChangeActivationThreshold = 1512; // 75% for testchains
diff --git a/src/rpc/claimtrie.cpp b/src/rpc/claimtrie.cpp
index a3af23a20..c8918ca89 100644
--- a/src/rpc/claimtrie.cpp
+++ b/src/rpc/claimtrie.cpp
@@ -910,8 +910,8 @@ static const CRPCCommand commands[] =
     { "hidden",             "getclaimtrie",                 &getclaimtrie,              { } },
     { "Claimtrie",          "getvalueforname",              &getvalueforname,           { T_NAME,T_BLOCKHASH,T_CLAIMID } },
     { "Claimtrie",          "getclaimsforname",             &getclaimsforname,          { T_NAME,T_BLOCKHASH } },
-    { "Claimtrie",          "gettotalclaimednames",         &gettotalclaimednames,      { "" } },
-    { "Claimtrie",          "gettotalclaims",               &gettotalclaims,            { "" } },
+    { "Claimtrie",          "gettotalclaimednames",         &gettotalclaimednames,      { } },
+    { "Claimtrie",          "gettotalclaims",               &gettotalclaims,            { } },
     { "Claimtrie",          "gettotalvalueofclaims",        &gettotalvalueofclaims,     { T_CONTROLLINGONLY } },
     { "Claimtrie",          "getclaimsfortx",               &getclaimsfortx,            { T_TXID } },
     { "Claimtrie",          "getnameproof",                 &getnameproof,              { T_NAME,T_BLOCKHASH,T_CLAIMID } },
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index e4e5f01b2..8a24c5850 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4803,11 +4803,11 @@ static const CRPCCommand commands[] =
     { "wallet",             "walletpassphrasechange",           &walletpassphrasechange,        {"oldpassphrase","newpassphrase"} },
     { "wallet",             "walletprocesspsbt",                &walletprocesspsbt,             {"psbt","sign","sighashtype","bip32derivs"} },
 
-    { "Claimtrie",          "claimname",                        &claimname,                     {"name","value","amount","address_type"} },
-    { "Claimtrie",          "updateclaim",                      &updateclaim,                   {"txid","value","amount","address_type"} },
+    { "Claimtrie",          "claimname",                        &claimname,                     {"name","value","amount"} },
+    { "Claimtrie",          "updateclaim",                      &updateclaim,                   {"txid","value","amount"} },
     { "Claimtrie",          "abandonclaim",                     &abandonclaim,                  {"txid","address"} },
     { "Claimtrie",          "listnameclaims",                   &listnameclaims,                {"includesuppports","activeonly","minconf"} },
-    { "Claimtrie",          "supportclaim",                     &supportclaim,                  {"name","claimid","amount","value","address_type"} },
+    { "Claimtrie",          "supportclaim",                     &supportclaim,                  {"name","claimid","amount","value"} },
     { "Claimtrie",          "abandonsupport",                   &abandonsupport,                {"txid","address"} },
 };
 // clang-format on