diff --git a/include/xrpl/beast/utility/instrumentation.h b/include/xrpl/beast/utility/instrumentation.h
index 7315e100ea..36fac27158 100644
--- a/include/xrpl/beast/utility/instrumentation.h
+++ b/include/xrpl/beast/utility/instrumentation.h
@@ -40,7 +40,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #define XRPL_ASSERT ALWAYS_OR_UNREACHABLE
 #define XRPL_ASSERT2(cond, location, message, ...) \
-    XRPL_ASSERT(cond, location##" : "##message)
+    XRPL_ASSERT(cond, std::string(location) + " : " + message)
 
 // How to use the instrumentation macros:
 //
diff --git a/src/xrpld/app/tx/detail/LoanPay.cpp b/src/xrpld/app/tx/detail/LoanPay.cpp
index 710f748965..40280b8d51 100644
--- a/src/xrpld/app/tx/detail/LoanPay.cpp
+++ b/src/xrpld/app/tx/detail/LoanPay.cpp
@@ -80,13 +80,9 @@ LoanPay::preclaim(PreclaimContext const& ctx)
 
     auto const principalOutstanding = loanSle->at(sfPrincipalOutstanding);
     TenthBips32 const interestRate{loanSle->at(sfInterestRate)};
-    auto const paymentInterval = loanSle->at(sfPaymentInterval);
     auto const paymentRemaining = loanSle->at(sfPaymentRemaining);
     TenthBips32 const lateInterestRate{loanSle->at(sfLateInterestRate)};
-    auto const latePaymentFee = loanSle->at(sfLatePaymentFee);
-    auto const prevPaymentDate = loanSle->at(sfPreviousPaymentDate);
     auto const startDate = loanSle->at(sfStartDate);
-    auto const nextDueDate = loanSle->at(sfNextPaymentDueDate);
 
     if (loanSle->at(sfBorrower) != account)
     {