diff --git a/src/manager.cpp b/src/manager.cpp
index 3937c06186ff669e4419fe3effd22fefc60115de..f413a6d487dc1a11c8b000d2760a9c8beccc3da2 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -266,7 +266,7 @@ Manager::init(const std::string &config_file)
     setSipLogLevel();
     PJSIP_TRY(pjlib_util_init());
     PJSIP_TRY(pjnath_init());
-#undef TRY
+#undef PJSIP_TRY
 
     RING_DBG("pjsip version %s for %s initialized",
              pj_get_version(), PJ_OS_NAME);
@@ -2289,7 +2289,7 @@ Manager::getAccountList() const
 
     using std::vector;
     using std::string;
-    vector<string> account_order(loadAccountOrder());
+    const vector<string> account_order(loadAccountOrder());
 
     // The IP2IP profile should always be available, and first in the list;
     // however, it is possible that it was deleted by removeAccounts()