diff --git a/Makefile b/Makefile
index 26eb1897b5..c71520738e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # See docs/installing.md
 
-build: nodes localnet build-haveno
+build: nodes localnet haveno
 
 clean:
 	./gradlew clean
@@ -14,9 +14,12 @@ localnet:
 nodes: localnet
 	./scripts/xmr_btc_deps.sh
 
-build-haveno:
+haveno:
 	./gradlew build
 
+haveno-apps: # quick build desktop and daemon apps without tests, etc
+	./gradlew :core:compileJava :desktop:build
+
 deploy:
 	# create a new screen session named 'localnet'
 	screen -dmS localnet
diff --git a/build.gradle b/build.gradle
index b2f7a493b5..72df94fe34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ configure(subprojects) {
         grpcVersion = '1.25.0'
         gsonVersion = '2.8.5'
         guavaVersion = '28.2-jre'
-        moneroJavaVersion = '0.5.5'
+        moneroJavaVersion = '0.5.8'
         httpclient5Version = '5.0'
         guiceVersion = '4.2.2'
         hamcrestVersion = '1.3'
diff --git a/core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java b/core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java
index 33342b445d..3a0aefbb8d 100644
--- a/core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java
+++ b/core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java
@@ -16,8 +16,6 @@ import javax.inject.Inject;
 
 import com.google.common.util.concurrent.FutureCallback;
 
-import java.io.File;
-
 import java.math.BigInteger;
 
 import java.util.ArrayList;
@@ -34,9 +32,6 @@ import org.slf4j.LoggerFactory;
 
 import lombok.Getter;
 
-
-
-import monero.common.MoneroUtils;
 import monero.daemon.MoneroDaemon;
 import monero.wallet.MoneroWallet;
 import monero.wallet.model.MoneroOutputWallet;
@@ -280,7 +275,6 @@ public class XmrWalletService {
   }
 
   public void shutDown() {
-    System.out.println("XmrWalletService.shutDown()");
 
     // collect wallets to shutdown
     List<MoneroWallet> openWallets = new ArrayList<MoneroWallet>();
@@ -297,7 +291,7 @@ public class XmrWalletService {
         public void run() {
           try { walletsSetup.getWalletConfig().closeWallet(openWallet); }
           catch (Exception e) {
-            e.printStackTrace(); // exception expected on shutdown when run as daemon TODO (woodser): detect if running as daemon
+            log.warn("Error closing monero-wallet-rpc subprocess. Was Haveno stopped manually with ctrl+c?");
           }
         }
       }));
@@ -307,12 +301,10 @@ public class XmrWalletService {
     for (Thread thread : threads) thread.start();
 
     // wait for all threads
-    System.out.println("Joining threads");
     for (Thread thread : threads) {
       try { thread.join(); }
       catch (InterruptedException e) { e.printStackTrace(); }
     }
-    System.out.println("Done joining threads");
   }
 
   ///////////////////////////////////////////////////////////////////////////////////////////