3 files changed, 10 insertions, 5 deletions
diff --git a/host/lib/transport/nirio/rpc/rpc_client.cpp b/host/lib/transport/nirio/rpc/rpc_client.cpp
index f8dc26b50..0c4b8fe3c 100644
--- a/host/lib/transport/nirio/rpc/rpc_client.cpp
+++ b/host/lib/transport/nirio/rpc/rpc_client.cpp
@@ -104,6 +104,11 @@ rpc_client::rpc_client (
     } catch (boost::exception&) {
         UHD_LOG << "rpc_client connection request cancelled/aborted." << std::endl;
         _exec_err.assign(boost::asio::error::connection_aborted, boost::asio::error::get_system_category());
+#if BOOST_VERSION < 104700
+    } catch (std::exception& e) {
+        UHD_LOG << "rpc_client connection error: " << e.what() << std::endl;
+        _exec_err.assign(boost::asio::error::connection_aborted, boost::asio::error::get_system_category());
+#endif
     }
 }
 
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index e931b7983..698d98f55 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -1321,8 +1321,8 @@ void x300_impl::update_atr_leds(gpio_core_200_32wo::sptr leds, const std::string
 {
     const bool is_txrx = (rx_ant == "TX/RX");
     const int rx_led = (1 << 2);
-    const int txrx_led = (1 << 1);
-    const int tx_led = (1 << 0);
+    const int tx_led = (1 << 1);
+    const int txrx_led = (1 << 0);
     leds->set_atr_reg(dboard_iface::ATR_REG_IDLE, 0);
     leds->set_atr_reg(dboard_iface::ATR_REG_RX_ONLY, is_txrx? txrx_led : rx_led);
     leds->set_atr_reg(dboard_iface::ATR_REG_TX_ONLY, tx_led);
diff --git a/host/lib/utils/log.cpp b/host/lib/utils/log.cpp
index d6d1786c7..31ee0c991 100644
--- a/host/lib/utils/log.cpp
+++ b/host/lib/utils/log.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2012 Ettus Research LLC
+// Copyright 2012,2014 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -117,11 +117,11 @@ UHD_SINGLETON_FCN(log_resource_type, log_rs);
  **********************************************************************/
 //! get the relative file path from the host directory
 static std::string get_rel_file_path(const fs::path &file){
-    fs::path abs_path = file.branch_path();
+    fs::path abs_path = file.parent_path();
     fs::path rel_path = file.leaf();
     while (not abs_path.empty() and abs_path.leaf() != "host"){
         rel_path = abs_path.leaf() / rel_path;
-        abs_path = abs_path.branch_path();
+        abs_path = abs_path.parent_path();
     }
     return rel_path.string();
 }