diff --git a/bitkeylib/client.py b/bitkeylib/client.py
index 2fd7dbcb8d..51e6d23ab0 100644
--- a/bitkeylib/client.py
+++ b/bitkeylib/client.py
@@ -36,9 +36,12 @@ class BitkeyClient(object):
         if self.master_public_key:
             return self.master_public_key
         
-        self.master_public_key = self.call(proto.GetMasterPublicKey(algo=self.algo))
+        self.master_public_key = self.call(proto.GetMasterPublicKey(algo=self.algo)).key
         return self.master_public_key
         
+    def get_address(self, n):
+        return self.call(proto.GetAddress(algo=self.algo, address_n=n)).address
+        
     def get_entropy(self, size):
         return self.call(proto.GetEntropy(size=size)).entropy
     
@@ -112,7 +115,7 @@ class BitkeyClient(object):
         return resp
 
     def get_uuid(self):
-        return self.call(proto.GetUUID())
+        return self.call(proto.GetUUID()).UUID
         
     def sign_tx(self, inputs, outputs):
         '''
diff --git a/bitkeylib/debuglink.py b/bitkeylib/debuglink.py
index 2e072f6fba..93e5825d4f 100644
--- a/bitkeylib/debuglink.py
+++ b/bitkeylib/debuglink.py
@@ -1,4 +1,5 @@
 import bitkey_pb2 as proto
+from transport import NotImplementedException
 
 def otp_info(otp):
     print "Device asks for OTP %s" % otp.otp