diff --git a/README.md b/README.md
index 4a93bf9..c9dd9b7 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,18 @@ To install from and build mailiverse from the origin, the origin must
 have "git", "ant", "rsync" and "oracle java" installed.  (Other javas might work, but I have
 not tested them.)  Also, your hosts file must point to mail.target and target.
 
+I have always used Ubuntu 12.04 or 13 as my target machine.
+The build works on Ubuntu 12.04 and also OSX (with dev tools).
+
 
 To install git:
 sudo apt-get install git --yes
 
 
+To install zip:
+sudo apt-get install unzip --yes
+
+
 To install ant:
 sudo apt-get install ant --yes
 
diff --git a/java/core/src/mail/server/storage/AWSStorageCreation.java b/java/core/src/mail/server/storage/AWSStorageCreation.java
index 5191877..90fa4c1 100644
--- a/java/core/src/mail/server/storage/AWSStorageCreation.java
+++ b/java/core/src/mail/server/storage/AWSStorageCreation.java
@@ -26,7 +26,6 @@ import com.amazonaws.services.s3.model.BucketCrossOriginConfiguration;
 import com.amazonaws.services.s3.model.BucketWebsiteConfiguration;
 import com.amazonaws.services.s3.model.CORSRule;
 import com.amazonaws.services.s3.model.Region;
-import com.sun.org.apache.xml.internal.security.utils.Base64;
 
 import core.connector.s3.sync.SimpleAWSCredentials;
 import core.util.LogOut;
@@ -34,6 +33,7 @@ import core.util.Maps;
 import core.util.Pair;
 import core.util.Passwords;
 import core.util.Strings;
+import core.util.Base64;
 
 public class AWSStorageCreation extends AWSStorageCommon
 {