diff --git a/wiki/base/wiki.py b/wiki/base/wiki.py
index 469e1fa..f057cac 100644
--- a/wiki/base/wiki.py
+++ b/wiki/base/wiki.py
@@ -80,9 +80,12 @@ class WikiManager(BaseConfiguration):
         return obj
 
     def resolveUid(self, uid):
-        if isinstance(uid, basestring) and ':' in uid:
-            protocol, address = uid.split(':', 1)
-            if protocol.lower() in protocols:
+        if isinstance(uid, basestring):
+            if ':' in uid:
+                protocol, address = uid.split(':', 1)
+                if protocol.lower() in protocols:
+                    return ExternalPage(uid)
+            if uid.startswith('/') or '..' in uid:
                 return ExternalPage(uid)
         return None
 
diff --git a/wiki/generic/wiki.py b/wiki/generic/wiki.py
index c8d77be..c268697 100644
--- a/wiki/generic/wiki.py
+++ b/wiki/generic/wiki.py
@@ -166,7 +166,7 @@ class WikiPage(BaseWikiPage):
         if self.context.getProperty('text') is None:
             self.context.manage_addProperty('text', text, 'text')
         else:
-            self.context.manage_changeProperties(id='text', value=text)
+            self.context.manage_changeProperties(text=text)
     text = property(getText, setText)
 
     def getWiki(self):