diff --git a/mozilla/grendel/calypso/util/ByteBuf.java b/mozilla/grendel/calypso/util/ByteBuf.java
index 452a1e04237..661357731f5 100644
--- a/mozilla/grendel/calypso/util/ByteBuf.java
+++ b/mozilla/grendel/calypso/util/ByteBuf.java
@@ -163,7 +163,7 @@ public final class ByteBuf {
     if (count < newLength) {
       ensureCapacity(newLength);
       for (; count < newLength; count++) {
-        value[count] = '\0';
+        value[count] = (byte)'\0';
       }
     }
     count = newLength;
diff --git a/mozilla/grendel/composition/AddressDialog.java b/mozilla/grendel/composition/AddressDialog.java
index dde441f01a7..7f7dba25414 100644
--- a/mozilla/grendel/composition/AddressDialog.java
+++ b/mozilla/grendel/composition/AddressDialog.java
@@ -31,7 +31,7 @@ class AddressDialog extends Dialog implements ActionListener {
     private final int BUTTON_WIDTH  = 100;
     private final int BUTTON_HEIGHT = 28;
 
-    private List        mSendToList;    //ListBox gadget that holds recipients names.
+    private java.awt.List        mSendToList;    //ListBox gadget that holds recipients names.
     private JTable      mTable;         //Tbale displays the address book entries.
     private Vector      mAddresses;     //a parallel list of recipients with mSendToList.
     private boolean     wasCanceled = true; //true if Cancel button was used to dismiss dialog.
diff --git a/mozilla/grendel/filters/FilterRulesParser.java b/mozilla/grendel/filters/FilterRulesParser.java
index edf5eb08ad8..5e343afc191 100644
--- a/mozilla/grendel/filters/FilterRulesParser.java
+++ b/mozilla/grendel/filters/FilterRulesParser.java
@@ -98,7 +98,7 @@ public class FilterRulesParser extends Object {
 
   // Instance classes
   private class StringToken extends Token {
-        private String fString;
+        String fString;
         StringToken(String s) {
           fString = s;
         }
diff --git a/mozilla/grendel/mime/encoder/MimeBase64Decoder.java b/mozilla/grendel/mime/encoder/MimeBase64Decoder.java
index a03b80a7617..66dbe1acb01 100644
--- a/mozilla/grendel/mime/encoder/MimeBase64Decoder.java
+++ b/mozilla/grendel/mime/encoder/MimeBase64Decoder.java
@@ -170,7 +170,7 @@ public final class MimeBase64Decoder extends MimeEncoder {
   public final void eof(ByteBuf out) {
     if (token != null && token_length != 0) {
       while (token_length < 4)
-        token[token_length++] = '=';
+        token[token_length++] = (byte)'=';
       decode_final_token(out);
     }
     token_length = 0;
diff --git a/mozilla/grendel/ui/StoreFactory.java b/mozilla/grendel/ui/StoreFactory.java
index e67b9ca7068..84d3b0d9a5f 100644
--- a/mozilla/grendel/ui/StoreFactory.java
+++ b/mozilla/grendel/ui/StoreFactory.java
@@ -51,7 +51,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
 
-public synchronized class StoreFactory {
+public class StoreFactory {
   static StoreFactory fInstance = null;
 
   Session fSession = null;