diff --git a/setup.py b/setup.py
index 97d94d1..edffd9f 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ OPTION_PREFIX = option_value("prefix")
 OPTION_BOOST = option_value("boost")
 
 if OPTION_PREFIX is None :
-    OPTION_PREFIX = '/Users/vb'
+    OPTION_PREFIX = os.environ["HOME"]
 
 if OPTION_BOOST is None :
     OPTION_BOOST = '/opt/local'
diff --git a/src/identity.hh b/src/identity.hh
index 14474e7..fa427ea 100644
--- a/src/identity.hh
+++ b/src/identity.hh
@@ -10,6 +10,7 @@
 namespace pEp {
     namespace PythonAdapter {
         using namespace utility;
+        using namespace std;
 
         // Identity is owning a pEp_identity