diff --git a/programs/light_client/qml/AccountPicker.qml b/programs/light_client/qml/AccountPicker.qml
index 2b682928..91ed1dd0 100644
--- a/programs/light_client/qml/AccountPicker.qml
+++ b/programs/light_client/qml/AccountPicker.qml
@@ -19,9 +19,9 @@ RowLayout {
    property Account account
    /// A real in the range [0,1] representing the amount of control the wallet has over this account
    property real accountControlLevel: account && account.isLoaded? account.getActiveControl(app.wallet) : 0
-   onAccountControlLevelChanged: console.log("New acl: " + accountControlLevel)
    /// An Array of Balance objects held by account
    property var balances: account? Object.keys(account.balances).map(function(key){return account.balances[key]})
+                                                                .filter(function(balance){return balance.amount > 0})
                                  : null
 
    /// Set the name field to have active focus
diff --git a/programs/light_client/qml/TransferForm.qml b/programs/light_client/qml/TransferForm.qml
index 21ffd3b7..636e3ad5 100644
--- a/programs/light_client/qml/TransferForm.qml
+++ b/programs/light_client/qml/TransferForm.qml
@@ -92,9 +92,9 @@ FormBase {
       Text {
          font.pixelSize: assetField.height / 2.5
          text: {
-            if (!senderPicker.account)
+            if (!senderPicker.account || !amountField.maxBalance)
                return ""
-            return qsTr("Fee:<br/>") + operation().fee / amountField.precisionAdjustment + " CORE"
+            return qsTr("Fee:<br/>") + amountField.maxBalance.type.formatAmount(operation().fee) + " CORE"
          }
       }
       Item { Layout.fillWidth: true }