diff --git a/OpenChange/MAPIStoreMessageTable.m b/OpenChange/MAPIStoreMessageTable.m
index f54f9d61b..439482666 100644
--- a/OpenChange/MAPIStoreMessageTable.m
+++ b/OpenChange/MAPIStoreMessageTable.m
@@ -39,4 +39,24 @@
   [self logWithFormat: @"unimplemented method: %@", NSStringFromSelector (_cmd)];
 }
 
+- (MAPIRestrictionState) evaluatePropertyRestriction: (struct mapi_SPropertyRestriction *) res
+				       intoQualifier: (EOQualifier **) qualifier
+{
+  MAPIRestrictionState rc;
+  id value;
+
+  value = NSObjectFromMAPISPropValue (&res->lpProp);
+  switch ((uint32_t) res->ulPropTag)
+    {
+    case PR_CHANGE_NUM:
+      [self warnWithFormat: @"!!!hack pending synchronisation enhancement"];
+      rc = MAPIRestrictionStateAlwaysTrue;
+      break;
+    default:
+      rc = [super evaluatePropertyRestriction: res intoQualifier: qualifier];
+    }
+
+  return rc;
+}
+
 @end
diff --git a/Tests/Unit/SaxXMLReaderFactory+SOGoTests.m b/Tests/Unit/SaxXMLReaderFactory+SOGoTests.m
index c2052d90a..a2fa8f08e 100644
--- a/Tests/Unit/SaxXMLReaderFactory+SOGoTests.m
+++ b/Tests/Unit/SaxXMLReaderFactory+SOGoTests.m
@@ -22,6 +22,7 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSFileManager.h>
 #import <Foundation/NSProcessInfo.h>
 
 #import <SaxObjC/SaxXMLReaderFactory.h>
@@ -37,18 +38,14 @@
 - (NSArray *) saxReaderSearchPathes
 {
   NSArray *pathes, *args;
-  NSDictionary *env;
-  NSString *pwd, *exedir;
+  NSString *cwd, *exedir;
 
   args = [[NSProcessInfo processInfo] arguments];
-  env = [[NSProcessInfo processInfo] environment];
-  pwd = [env objectForKey: @"PWD"];
-  if (!pwd)
-    pwd = @"";
+  cwd = [[NSFileManager defaultManager] currentDirectoryPath];
   exedir = [[args objectAtIndex: 0] stringByDeletingLastPathComponent];
   pathes = [NSArray arrayWithObject:
                       [NSString stringWithFormat: @"%@/%@/%@",
-                                pwd, exedir,
+                                cwd, exedir,
                                 @"../../../SOPE/NGCards/versitCardsSaxDriver/"]];
 
   return pathes;