diff --git a/OpenChange/MAPIStoreCommonViewsContext.m b/OpenChange/MAPIStoreCommonViewsContext.m
index 9fbf61e30..6b711a233 100644
--- a/OpenChange/MAPIStoreCommonViewsContext.m
+++ b/OpenChange/MAPIStoreCommonViewsContext.m
@@ -22,17 +22,10 @@
 
 #import <Foundation/NSString.h>
 
-#import <NGExtensions/NSObject+Logs.h>
-
 #import "MAPIStoreMapping.h"
 
 #import "MAPIStoreCommonViewsContext.h"
 
-// #undef DEBUG
-// #include <mapistore/mapistore.h>
-// #include <mapistore/mapistore_errors.h>
-// #include <libmapiproxy.h>
-
 @implementation MAPIStoreCommonViewsContext
 
 + (NSString *) MAPIModuleName
diff --git a/OpenChange/MAPIStoreFreebusyContext.m b/OpenChange/MAPIStoreFreebusyContext.m
index 8b3f9e9eb..b6813e167 100644
--- a/OpenChange/MAPIStoreFreebusyContext.m
+++ b/OpenChange/MAPIStoreFreebusyContext.m
@@ -45,7 +45,7 @@
 
 - (void) setupModuleFolder
 {
-  id userFolder;
+  SOGoUserFolder *userFolder;
 
   userFolder = [SOGoUserFolder objectWithName: [authenticator username]
                                   inContainer: MAPIApp];