diff --git a/gui/src/main/java/io/bisq/gui/app/BisqApp.java b/gui/src/main/java/io/bisq/gui/app/BisqApp.java
index 0d53b0f078..2c8033dac2 100644
--- a/gui/src/main/java/io/bisq/gui/app/BisqApp.java
+++ b/gui/src/main/java/io/bisq/gui/app/BisqApp.java
@@ -346,7 +346,7 @@ public class BisqApp extends Application {
 
     private void showEmptyWalletPopup(WalletService walletService) {
         EmptyWalletWindow emptyWalletWindow = injector.getInstance(EmptyWalletWindow.class);
-        emptyWalletWindow.setwalletService(walletService);
+        emptyWalletWindow.setWalletService(walletService);
         emptyWalletWindow.show();
     }
 
diff --git a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
index 666fa7722d..95f070bd24 100644
--- a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
+++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
@@ -90,6 +90,7 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
     // If we would change the price representation in the domain we would not be backward compatible
     final StringProperty price = new SimpleStringProperty();
     final StringProperty makerFee = new SimpleStringProperty();
+    final StringProperty makerFeeWithCode = new SimpleStringProperty();
     final StringProperty makerFeeCurrencyCode = new SimpleStringProperty();
 
     // Positive % value means always a better price form the maker's perspective:
@@ -196,8 +197,8 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
             UserThread.runAfter(() -> {
                 switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) {
                     case "BTC":
-                        amount.set("0.0001");
-                        price.set("7000");
+                        amount.set("0.1");
+                        price.set("0.00001");
                         break;
                     case "LTC":
                         amount.set("50");
@@ -461,6 +462,7 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
 
     private void applyMakerFee() {
         makerFee.set(getFormatterForMakerFee().formatCoin(dataModel.getMakerFee()));
+        makerFeeWithCode.set(getFormatterForMakerFee().formatCoinWithCode(dataModel.getMakerFee()));
         makerFeeCurrencyCode.set(dataModel.isCurrencyForMakerFeeBtc() ? Res.getBaseCurrencyCode() : "BSQ");
     }
 
@@ -634,8 +636,8 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
 
     }
 
-    void setCurrencyForMakerFeeBtc(boolean currencyForMakerFeeBtc) {
-        dataModel.setPreferredCurrencyForMakerFeeBtc(currencyForMakerFeeBtc);
+    void setIsCurrencyForMakerFeeBtc(boolean isCurrencyForMakerFeeBtc) {
+        dataModel.setPreferredCurrencyForMakerFeeBtc(isCurrencyForMakerFeeBtc);
         applyMakerFee();
     }