diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 45068b663cb..5f2b6d6b666 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -67,4 +67,10 @@
   -->
   <bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/>
   
+  
+  <!--
+    Gurus
+  -->
+  
+  
 </beans>
diff --git a/core/src/com/cloud/storage/StoragePoolVO.java b/core/src/com/cloud/storage/StoragePoolVO.java
index 188a23e8992..49abd50a5b1 100644
--- a/core/src/com/cloud/storage/StoragePoolVO.java
+++ b/core/src/com/cloud/storage/StoragePoolVO.java
@@ -77,11 +77,14 @@ public class StoragePoolVO implements StoragePool {
     @Enumerated(value=EnumType.STRING)
     private StoragePoolStatus status;
     
-    // @Column(name="storage_provider", updatable=true, nullable=false)
-    private String storageProvider;
+    // TODO, disable persisency of storageProvider and storageType, javelin new code not
+    // sync with the schema!
     
-    // @Column(name="storage_type", nullable=false)
-    private String storageType;
+    // @Column(name="storage_provider", updatable=true, nullable=false)
+    @Transient private String storageProvider;
+    
+    // Column(name="storage_type", nullable=false)
+    @Transient private String storageType;
     
 	@Override
     public long getId() {
@@ -135,7 +138,7 @@ public class StoragePoolVO implements StoragePool {
     public long getAvailableBytes() {
 		return availableBytes;
 	}
-	
+
 	@Override
 	public String getStorageProvider() {
 		return storageProvider;
@@ -153,7 +156,7 @@ public class StoragePoolVO implements StoragePool {
 	public void setStorageType(String type) {
 		storageType = type;
 	}
-
+	
 	@Override
     public long getCapacityBytes() {
 		return capacityBytes;
diff --git a/developer/pom.xml b/developer/pom.xml
index 236b82fdc35..2cab6a1efa3 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -184,7 +184,6 @@
                   <srcFiles>
                     <srcFile>${basedir}/target/db/create-schema-view.sql</srcFile>
                     <srcFile>${basedir}/target/db/templates.sql</srcFile>
-                    <srcFile>${basedir}/target/db/create-index-fk.sql</srcFile>
                     <srcFile>${basedir}/target/db/cloudbridge_schema.sql</srcFile>
                     <srcFile>${basedir}/target/db/cloudbridge_multipart.sql</srcFile>
                     <srcFile>${basedir}/target/db/cloudbridge_index.sql</srcFile>
@@ -474,7 +473,6 @@
                     <srcFile>${basedir}/target/db/create-schema-view.sql</srcFile>
                     <srcFile>${basedir}/target/db/create-schema-premium.sql</srcFile>
                     <srcFile>${basedir}/target/db/templates.sql</srcFile>
-                    <srcFile>${basedir}/target/db/create-index-fk.sql</srcFile>
                     <srcFile>${basedir}/target/db/cloudbridge_schema.sql</srcFile>
                     <srcFile>${basedir}/target/db/cloudbridge_multipart.sql</srcFile>
                     <srcFile>${basedir}/target/db/cloudbridge_index.sql</srcFile>
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 65501e3b416..bdc97469496 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -499,7 +499,7 @@ public class ManagementServerImpl implements ManagementServer {
 				if(Manager.class.isAssignableFrom(ComponentContext.getTargetClass(adapter)))
 					continue;
 				
-				if(!adapter.configure(adapter.getClass().getSimpleName(), params)) {
+				if(!adapter.configure(adapter.getName(), params)) {
                     throw new CloudRuntimeException("Failed to start adapter: " + ComponentContext.getTargetClass(adapter).getName());
                 }
                 if (!adapter.start()) {
diff --git a/utils/src/com/cloud/utils/component/AdapterBase.java b/utils/src/com/cloud/utils/component/AdapterBase.java
index 8fd374aebee..a735d85fd19 100644
--- a/utils/src/com/cloud/utils/component/AdapterBase.java
+++ b/utils/src/com/cloud/utils/component/AdapterBase.java
@@ -52,7 +52,7 @@ public class AdapterBase implements Adapter {
 
     public static <T extends Adapter> T getAdapterByName(List<T> adapters, String name) {
     	for(T adapter : adapters) {
-    		if(adapter.getName().equals(name))
+    		if(adapter.getName().equalsIgnoreCase(name))
     			return adapter;
     	}
     	return null;