diff --git a/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStorageClient.java b/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStorageClient.java
index 5c08d803f4..1a8b4b8c21 100644
--- a/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStorageClient.java
+++ b/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStorageClient.java
@@ -38,7 +38,7 @@ import org.jclouds.http.options.GetOptions;
  * @see <a href="https://community.emc.com/community/labs/atmos_online" />
  * @author Adrian Cole
  */
-@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
+@Timeout(duration = 300, timeUnit = TimeUnit.SECONDS)
 public interface AtmosStorageClient {
    /**
     * Creates a default implementation of AtmosObject
diff --git a/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStoragePropertiesBuilder.java b/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStoragePropertiesBuilder.java
index 0a6be10905..62817e4f47 100644
--- a/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStoragePropertiesBuilder.java
+++ b/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStoragePropertiesBuilder.java
@@ -32,11 +32,12 @@ import org.jclouds.atmosonline.saas.reference.AtmosStorageConstants;
  * @author Adrian Cole
  */
 public class AtmosStoragePropertiesBuilder extends PropertiesBuilder {
+   
    @Override
    protected Properties defaultProperties() {
       Properties properties = super.defaultProperties();
       properties.setProperty(AtmosStorageConstants.PROPERTY_EMCSAAS_ENDPOINT,
-               "http://accesspoint.emccis.com");
+               "https://accesspoint.atmosonline.com");
       properties.setProperty(AtmosStorageConstants.PROPERTY_EMCSAAS_SESSIONINTERVAL, "60");
       return properties;
    }
diff --git a/atmos/src/main/java/org/jclouds/atmosonline/saas/handlers/ParseAtmosStorageErrorFromXmlContent.java b/atmos/src/main/java/org/jclouds/atmosonline/saas/handlers/ParseAtmosStorageErrorFromXmlContent.java
index 8a3c8cf8aa..c54ff0874d 100644
--- a/atmos/src/main/java/org/jclouds/atmosonline/saas/handlers/ParseAtmosStorageErrorFromXmlContent.java
+++ b/atmos/src/main/java/org/jclouds/atmosonline/saas/handlers/ParseAtmosStorageErrorFromXmlContent.java
@@ -25,6 +25,7 @@ import java.util.regex.Pattern;
 
 import javax.annotation.Resource;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
 import org.jclouds.atmosonline.saas.AtmosStorageResponseException;
 import org.jclouds.atmosonline.saas.domain.AtmosStorageError;
@@ -49,6 +50,7 @@ import com.google.common.io.Closeables;
  * @author Adrian Cole
  * 
  */
+@Singleton
 public class ParseAtmosStorageErrorFromXmlContent implements HttpErrorHandler {
    @Resource
    protected Logger logger = Logger.NULL;
diff --git a/atmos/src/test/resources/log4j.xml b/atmos/src/test/resources/log4j.xml
index 5dee9ab38d..7dabd5efd4 100755
--- a/atmos/src/test/resources/log4j.xml
+++ b/atmos/src/test/resources/log4j.xml
@@ -120,7 +120,7 @@
     <category name="jclouds.headers">
         <priority value="DEBUG" />
         <appender-ref ref="ASYNCWIRE" />
-    </category><!--
+    </category>
 
     <category name="jclouds.wire">
         <priority value="DEBUG" />
@@ -128,7 +128,7 @@
     </category>
    
    
-    --><!-- ======================= -->
+    <!-- ======================= -->
     <!-- Setup the Root category -->
     <!-- ======================= -->