diff --git a/SoObjects/SOGo/SOGoUser.h b/SoObjects/SOGo/SOGoUser.h
index cee56d1ce..03757826f 100644
--- a/SoObjects/SOGo/SOGoUser.h
+++ b/SoObjects/SOGo/SOGoUser.h
@@ -147,6 +147,8 @@ extern NSString *SOGoWeekStartFirstFullWeek;
 - (NSArray *) rolesForObject: (NSObject *) object
                    inContext: (WOContext *) context;
 
+- (void) migrateSignature;
+
 @end
 
 #endif /* __SOGoUser_H__ */
diff --git a/UI/Contacts/UIxContactFoldersView.h b/UI/Contacts/UIxContactFoldersView.h
index 490ac6de0..bbe531c6c 100644
--- a/UI/Contacts/UIxContactFoldersView.h
+++ b/UI/Contacts/UIxContactFoldersView.h
@@ -43,6 +43,8 @@
 
 - (WOResponse *) saveDragHandleStateAction;
 
+- (BOOL) isPopup;
+
 @end
 
 #endif /* UIXCONTACTFOLDERSVIEW_H */
diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m
index 5c498f2a1..fcb84be20 100644
--- a/UI/Contacts/UIxContactFoldersView.m
+++ b/UI/Contacts/UIxContactFoldersView.m
@@ -357,18 +357,18 @@
 
 - (void) checkDefaultModulePreference
 {
-  NSUserDefaults *ud;
+  NSUserDefaults *clientUD;
   NSString *pref;
 
   if (![self isPopup])
     {
-      ud = [[context activeUser] userDefaults];
-      pref = [ud stringForKey: @"SOGoUIxDefaultModule"];
+      clientUD = [[context activeUser] userDefaults];
+      pref = [clientUD stringForKey: @"SOGoUIxDefaultModule"];
 
       if (pref && [pref isEqualToString: @"Last"])
         {
-          [ud setObject: @"Contacts" forKey: @"SOGoUIxLastModule"];
-          [ud synchronize];
+          [clientUD setObject: @"Contacts" forKey: @"SOGoUIxLastModule"];
+          [clientUD synchronize];
         }
     }
 }
diff --git a/UI/Contacts/UIxContactsListView.m b/UI/Contacts/UIxContactsListView.m
index f0b3f289c..faa011cc2 100644
--- a/UI/Contacts/UIxContactsListView.m
+++ b/UI/Contacts/UIxContactsListView.m
@@ -28,6 +28,7 @@
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSString+misc.h>
+#import <NGExtensions/NSNull+misc.h>
 
 #import <Contacts/SOGoContactObject.h>
 #import <Contacts/SOGoContactFolder.h>
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index b47157b9d..12c62520c 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -569,8 +569,6 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
 
 - (NSString *) signature
 {
-  NSString *signature;
-
   [user migrateSignature];
   return [userDefaults stringForKey: @"MailSignature"];
 }