diff --git a/mozilla/netwerk/cookie/src/nsCookie.h b/mozilla/netwerk/cookie/src/nsCookie.h
index e433d9fbd70..d31a7e42a90 100644
--- a/mozilla/netwerk/cookie/src/nsCookie.h
+++ b/mozilla/netwerk/cookie/src/nsCookie.h
@@ -123,7 +123,7 @@ class nsCookie : public nsICookie2
     // setters
     inline void SetExpiry(PRInt64 aExpiry)        { mExpiry = aExpiry; }
     inline void SetLastAccessed(PRInt64 aTime)    { mLastAccessed = aTime; }
-    inline void SetIsSession(PRBool aIsSession)   { mIsSession = aIsSession; }
+    inline void SetIsSession(PRBool aIsSession)   { mIsSession = (PRPackedBool) aIsSession; }
     // set the creation id manually, overriding the monotonicity checks in Create().
     // use with caution!
     inline void SetCreationID(PRInt64 aID)        { mCreationID = aID; }
diff --git a/mozilla/netwerk/cookie/src/nsCookieService.cpp b/mozilla/netwerk/cookie/src/nsCookieService.cpp
index 8d1d9441b79..ced5ed3d043 100644
--- a/mozilla/netwerk/cookie/src/nsCookieService.cpp
+++ b/mozilla/netwerk/cookie/src/nsCookieService.cpp
@@ -770,13 +770,13 @@ nsCookieService::PrefChanged(nsIPrefBranch *aPrefBranch)
 {
   PRInt32 val;
   if (NS_SUCCEEDED(aPrefBranch->GetIntPref(kPrefCookiesPermissions, &val)))
-    mCookiesPermissions = LIMIT(val, 0, 2, 0);
+    mCookiesPermissions = (PRUint8) LIMIT(val, 0, 2, 0);
 
   if (NS_SUCCEEDED(aPrefBranch->GetIntPref(kPrefMaxNumberOfCookies, &val)))
-    mMaxNumberOfCookies = LIMIT(val, 0, 0xFFFF, 0xFFFF);
+    mMaxNumberOfCookies = (PRUint16) LIMIT(val, 0, 0xFFFF, 0xFFFF);
 
   if (NS_SUCCEEDED(aPrefBranch->GetIntPref(kPrefMaxCookiesPerHost, &val)))
-    mMaxCookiesPerHost = LIMIT(val, 0, 0xFFFF, 0xFFFF);
+    mMaxCookiesPerHost = (PRUint16) LIMIT(val, 0, 0xFFFF, 0xFFFF);
 }
 
 /******************************************************************************
diff --git a/mozilla/xpcom/string/public/nsCharTraits.h b/mozilla/xpcom/string/public/nsCharTraits.h
index 17ed66fc544..9667b4f6bcb 100644
--- a/mozilla/xpcom/string/public/nsCharTraits.h
+++ b/mozilla/xpcom/string/public/nsCharTraits.h
@@ -315,7 +315,12 @@ struct nsCharTraits<PRUnichar>
     ASCIIToLower( char_type c )
       {
         if (c < 0x100)
-          return (c >= 'A' && c <= 'Z') ? c + ('a' - 'A') : c;
+          {
+            if (c >= 'A' && c <= 'Z')
+              return char_type(c + ('a' - 'A'));
+          
+            return c;
+          }
         else
           {
             if (c == 0x212A) // KELVIN SIGN
@@ -570,7 +575,10 @@ struct nsCharTraits<char>
     char_type
     ASCIIToLower( char_type c )
       {
-        return (c >= 'A' && c <= 'Z') ? (c + ('a' - 'A')) : c;
+        if (c >= 'A' && c <= 'Z')
+          return char_type(c + ('a' - 'A'));
+
+        return c;
       }
 
     static