diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 9ea1ac4f7..b28f5c6d8 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -109,7 +109,7 @@ public:
         pchMessageStart[1] = 0xc6;
         pchMessageStart[2] = 0x07;
         pchMessageStart[3] = 0x9a;
-        nDefaultPort = 9333;
+        nDefaultPort = 9338;
         nPruneAfterHeight = 100000;
 
         const uint32_t genesisBlockReward = 0.00001 * COIN; // A small reward for the core developers :-)
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index 44f2c31a5..7f1fc205a 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -33,7 +33,7 @@ class CBaseMainParams : public CBaseChainParams
 public:
     CBaseMainParams()
     {
-        nRPCPort = 9332;
+        nRPCPort = 9337;
     }
 };
 
@@ -46,7 +46,7 @@ public:
     CBaseTestNetParams()
     {
         nRPCPort = 19332;
-        strDataDir = "testnet5";
+        strDataDir = "testnet6";
     }
 };
 
diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
index 5ec24076b..21e0efbcb 100644
--- a/src/qt/bitcoinunits.cpp
+++ b/src/qt/bitcoinunits.cpp
@@ -41,8 +41,8 @@ QString BitcoinUnits::longName(int unit)
     switch(unit)
     {
     case BTC: return QString("KVA");
-    case mBTC: return QString("k");
-    case uBTC: return QString("m");
+    case mBTC: return QString("va");
+    case uBTC: return QString("mva");
     default: return QString("???");
     }
 }
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 33bdde245..f4eca25d3 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -107,7 +107,7 @@ static const uint8_t dummydata[] = {0xeb,0x15,0x23,0x1d,0xfc,0xeb,0x60,0x92,0x58
 // Generate a dummy address with invalid CRC, starting with the network prefix.
 static std::string DummyAddress(const CChainParams &params)
 {
-    std::vector<unsigned char> sourcedata = params.Base58Prefix(CChainParams::PUBKEY_ADDRESS);
+    std::vector<unsigned char> sourcedata = params.Base58Prefix(CChainParams::SCRIPT_ADDRESS2);
     sourcedata.insert(sourcedata.end(), dummydata, dummydata + sizeof(dummydata));
     for(int i=0; i<256; ++i) { // Try every trailing byte
         std::string s = EncodeBase58(sourcedata.data(), sourcedata.data() + sourcedata.size());