diff --git a/app/Constants.php b/app/Constants.php
index 8c6a60458d..d19a3687df 100644
--- a/app/Constants.php
+++ b/app/Constants.php
@@ -222,7 +222,7 @@ if (! defined('APP_NAME')) {
     define('IMPORT_PANCAKE', 'Pancake');
 
     define('MAX_NUM_CLIENTS', 100);
-    define('MAX_NUM_CLIENTS_PRO', 20000);
+    define('MAX_NUM_CLIENTS_PRO', 40000);
     define('MAX_NUM_CLIENTS_LEGACY', 500);
     define('MAX_INVOICE_AMOUNT', 1000000000);
     define('LEGACY_CUTOFF', 57800);
diff --git a/app/Models/AccountGatewaySettings.php b/app/Models/AccountGatewaySettings.php
index ded2c05077..4d5333b492 100644
--- a/app/Models/AccountGatewaySettings.php
+++ b/app/Models/AccountGatewaySettings.php
@@ -53,7 +53,7 @@ class AccountGatewaySettings extends EntityModel
 
     public function hasTaxes()
     {
-        return floatval($this->fee_tax_rate1) || floatval($this->fee_tax_rate1);
+        return floatval($this->fee_tax_rate1) || floatval($this->fee_tax_rate2);
     }
 
     public function feesToString()
diff --git a/database/seeds/CurrenciesSeeder.php b/database/seeds/CurrenciesSeeder.php
index c202d22470..945a961381 100644
--- a/database/seeds/CurrenciesSeeder.php
+++ b/database/seeds/CurrenciesSeeder.php
@@ -52,7 +52,7 @@ class CurrenciesSeeder extends Seeder
             ['name' => 'Aruban Florin', 'code' => 'AWG', 'symbol' => 'Afl. ', 'precision' => '2', 'thousand_separator' => ' ', 'decimal_separator' => '.'],
             ['name' => 'Turkish Lira', 'code' => 'TRY', 'symbol' => 'TL ', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','],
             ['name' => 'Romanian New Leu', 'code' => 'RON', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
-            ['name' => 'Croatian Kuna', 'code' => 'HRK', 'symbol' => 'kn', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','],
+            ['name' => 'Croatian Kuna', 'code' => 'HRK', 'symbol' => 'kn', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ',', 'swap_currency_symbol' => true],
             ['name' => 'Saudi Riyal', 'code' => 'SAR', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['name' => 'Japanese Yen', 'code' => 'JPY', 'symbol' => '¥', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['name' => 'Maldivian Rufiyaa', 'code' => 'MVR', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
@@ -100,7 +100,7 @@ class CurrenciesSeeder extends Seeder
             ['name' => 'Cape Verdean Escudo', 'code' => 'CVE', 'symbol' => '', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => '$'],
             ['name' => 'Kuwaiti Dinar', 'code' => 'KWD', 'symbol' => 'KD', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['name' => 'Algerian Dinar', 'code' => 'DZD', 'symbol' => 'DA', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
-            ['name' => 'Macedonian Denar', 'code' => 'MKD', 'symbol' => 'den', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['name' => 'Macedonian Denar', 'code' => 'MKD', 'symbol' => 'ден', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['name' => 'Fijian Dollar', 'code' => 'FJD', 'symbol' => 'FJ$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['name' => 'Bolivian Boliviano', 'code' => 'BOB', 'symbol' => 'Bs', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['name' => 'Albanian Lek', 'code' => 'ALL', 'symbol' => 'L ', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','],
diff --git a/docs/install.rst b/docs/install.rst
index c10ebf7c51..0934506f55 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -92,6 +92,7 @@ Troubleshooting
 ^^^^^^^^^^^^^^^
 
 - Check your webserver log (ie, /var/log/apache2/error.log) and the application logs (storage/logs/laravel-error.log) for more details or set ``APP_DEBUG=true`` in .env
+- If you see "Whoops, looks like something went wrong" this `blog post <https://bobcares.com/blog/laravel-something-went-wrong/>`_ may be helpful.
 - To resolve ``[Symfony\Component\Debug\Exception\FatalErrorException] Class 'SomeClass' not found`` try running php artisan optimize
 - To resolve ``file_put_contents(...): failed to open stream: Permission denied`` run ``chmod -R 777 storage`` then ``chmod -R 755 storage``
 - If index.php is in the URL it likely means that mod_rewrite needs to be enabled.
diff --git a/docs/mobile_apps.rst b/docs/mobile_apps.rst
index 8a005c3d50..f5f9ea52e9 100644
--- a/docs/mobile_apps.rst
+++ b/docs/mobile_apps.rst
@@ -24,7 +24,7 @@ Mobile App configuration
 
 Once you have completed the in-app purchase to unlock the mobile app to connect to your own server, you'll be presented with two fields.
 
-The first is the Base URL of your self-hosted installation, ie http://ninja.yourapp.com
+The first is the Base URL of your self-hosted installation, ie. https://ninja.example.com or https://ninja.example.com/public
 
 The second field is the API_SECRET, enter in the API_SECRET you used in your .env file.