diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index c040379d293..5a0ad7b0cb4 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -302,6 +302,9 @@
       <resource>
           <directory>../utils/conf/</directory>
       </resource>
+      <resource>
+        <directory>${basedir}/resource/AmazonEC2</directory>
+      </resource>
     </resources>
     <plugins>
 	  <plugin>
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
index e77061169d9..6770a9cc514 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
@@ -42,7 +42,7 @@ public class CloudStackConfigurationDaoImpl extends GenericDaoBase<CloudStackCon
     @DB
     public String getConfigValue(String name) {
         NameSearch.and("name", NameSearch.entity().getName(), SearchCriteria.Op.EQ);
-        Transaction txn = Transaction.currentTxn();
+        Transaction txn = Transaction.open("cloud", Transaction.CLOUD_DB, true);
         try {
             txn.start();
             SearchCriteria<CloudStackConfigurationVO> sc = NameSearch.create();
diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
index 67028f8508b..15df24e62d2 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
@@ -199,7 +199,7 @@ public class EC2RestServlet extends HttpServlet {
             if (installedPath == null) installedPath = System.getProperty("catalina.home");
             String webappPath = config.getServletContext().getRealPath("/");
             //pathToKeystore = new String( installedPath + File.separator + "webapps" + File.separator + webappName + File.separator + "WEB-INF" + File.separator + "classes" + File.separator + keystore );
-            pathToKeystore = new String( webappPath + "WEB-INF" + File.separator + "classes" + File.separator + keystore );
+            pathToKeystore = new String( webappPath +  File.separator +  "\\WEB-INF" + File.separator + "classes" + File.separator + keystore );
         }
     }
 
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
index 593e84937ae..0f98518d8ef 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
@@ -206,8 +206,6 @@ public class ServiceProvider extends ManagerBase {
         if(logger.isInfoEnabled())
             logger.info("Initializing ServiceProvider...");
 
-        Transaction txn = Transaction.open(Transaction.AWSAPI_DB);
-        //txn.close();
 
         File file = ConfigurationHelper.findConfigurationFile("log4j-cloud.xml");
         if(file != null) {