diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 03609d0c5..77c4e4584 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -20,6 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSEnumerator.h>
+
 #import "NSString+Utilities.h"
 #import "NSDictionary+URL.h"
 
diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings
index 8f237d569..95e560d96 100644
--- a/UI/Contacts/English.lproj/Localizable.strings
+++ b/UI/Contacts/English.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "Preferred" = "Preferred";
 "Card for %@" = "Card for %@";
 "Display Name: " = "Display Name: ";
-"Email Address: " = "Email Address: "
+"Email Address: " = "Email Address: ";
 
 "Firstname: " = "Firstname: ";
 "Lastname: " = "Lastname: ";
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index c9063d6e8..a90cdf1b4 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -19,7 +19,8 @@
   02111-1307, USA.
 */
 
-#import <SoObjects/Mailer/SOGoMailObject.h>
+#import <Mailer/SOGoMailObject.h>
+#import <SOGo/NSString+Utilities.h>
 #import <SOGoUI/UIxComponent.h>
 #import "UIxMailMainFrame.h"
 
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index 6f24256c0..6c797a613 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -27,7 +27,7 @@
 "Week"          = "Semaine";
 "this week"     = "cette semaine";
 
-"Week %d" = "Semaine nș %d";
+"Week %d" = "Semaine nĂș %d";
 
 /* Month */
 
diff --git a/UI/Scheduler/UIxCalInlineAptView.m b/UI/Scheduler/UIxCalInlineAptView.m
index 55f212945..6199e619e 100644
--- a/UI/Scheduler/UIxCalInlineAptView.m
+++ b/UI/Scheduler/UIxCalInlineAptView.m
@@ -20,6 +20,8 @@
  */
 // $Id: UIxCalInlineAptView.m 885 2005-07-21 16:41:34Z znek $
 
+#import <math.h>
+
 #import <Foundation/NSDictionary.h>
 
 #import <NGObjWeb/NGObjWeb.h>
diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m
index 3d0e664ba..7dee0da0a 100644
--- a/UI/Scheduler/UIxCalView.m
+++ b/UI/Scheduler/UIxCalView.m
@@ -12,6 +12,7 @@
 #import "UIxComponent+Agenor.h"
 
 #import "SoObjects/Appointments/SOGoAppointmentFolder.h"
+#import <SOGo/NSArray+Utilities.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoObject.h>
 
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 9a904ec0a..c6357450f 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -6,7 +6,6 @@
     xmlns:label="OGo:label"
     className="UIxPageFrame"
     title="title"
-    popup="isPopup"
     >
     <div class="menu" id="monthListMenu">
       <ul>