diff --git a/awsapi/conf/CloudStack.cfg.xml b/awsapi/conf/CloudStack.cfg.xml
index d34d2f55367..1ba6f5ccf02 100644
--- a/awsapi/conf/CloudStack.cfg.xml
+++ b/awsapi/conf/CloudStack.cfg.xml
@@ -14,7 +14,7 @@
 	<property name="hibernate.order_updates">true</property>
     <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
     
-    <property name="show_sql">true</property>
+    <property name="show_sql">false</property>
     <!--  to debug hibernate generated SQL, open following configuration property -->
     <!--  
     <property name="show_sql">true</property>
diff --git a/awsapi/conf/hibernate.cfg.xml b/awsapi/conf/hibernate.cfg.xml
index e100e1a75c3..3542cd23bc2 100644
--- a/awsapi/conf/hibernate.cfg.xml
+++ b/awsapi/conf/hibernate.cfg.xml
@@ -14,7 +14,7 @@
 	<property name="hibernate.order_updates">true</property>
     <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
     
-    <property name="show_sql">true</property>
+    <property name="show_sql">false</property>
     <!--  to debug hibernate generated SQL, open following configuration property -->
     <!--  
     <property name="show_sql">true</property>
diff --git a/awsapi/conf/log4j-cloud-bridge.xml b/awsapi/conf/log4j-cloud-bridge.xml
deleted file mode 100644
index cc5a76f6de2..00000000000
--- a/awsapi/conf/log4j-cloud-bridge.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A time/date based rolling appender -->
-   <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-      <param name="File" value="${catalina.base}/logs/cloudbridge.log"/>
-      <param name="Append" value="true"/>
-      <param name="Threshold" value="DEBUG"/>
-
-      <!-- Rollover at midnight each day -->
-      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d %-5p [%c{3}] (%t:%x) %m%n"/>
-      </layout>
-   </appender>
-   
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="DEBUG"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         	<param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="com.cloud">
-     	<priority value="DEBUG"/>
-   </category>
-   
-   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
-   <category name="org.apache">
-      	<priority value="INFO"/>
-   </category>
-
-   <category name="org">
-      	<priority value="INFO"/>
-   </category>
-   
-   <category name="net">
-     	<priority value="INFO"/>
-   </category>
-
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <level value="INFO"/>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>
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 c00f2a202a8..18acb1a9ca3 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
@@ -198,7 +198,7 @@ public class ServiceProvider {
 		if(logger.isInfoEnabled())
 			logger.info("Initializing ServiceProvider...");
 
-		File file = ConfigurationHelper.findConfigurationFile("log4j-cloud-bridge.xml");
+		File file = ConfigurationHelper.findConfigurationFile("log4j-cloud.xml");
 		if(file != null) {
 			System.out.println("Log4j configuration from : " + file.getAbsolutePath());
 			DOMConfigurator.configureAndWatch(file.getAbsolutePath(), 10000);
@@ -327,6 +327,7 @@ public class ServiceProvider {
 				try {
 					result = method.invoke(serviceObject, args);
 					PersistContext.commitTransaction();
+			        PersistContext.commitTransaction(true);
 				} catch (PersistException e) {
 				} catch (SessionException e) {
 				} catch(Throwable e) {
@@ -345,6 +346,7 @@ public class ServiceProvider {
 					}
 				} finally {
 					PersistContext.closeSession();
+			        PersistContext.closeSession(true);
 				}
 				return result;
 			}