diff --git a/core/src/com/cloud/storage/StoragePoolVO.java b/core/src/com/cloud/storage/StoragePoolVO.java
index b76d74246c7..188a23e8992 100644
--- a/core/src/com/cloud/storage/StoragePoolVO.java
+++ b/core/src/com/cloud/storage/StoragePoolVO.java
@@ -30,10 +30,8 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
-import org.apache.cloudstack.api.Identity;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="storage_pool")
@@ -79,10 +77,10 @@ public class StoragePoolVO implements StoragePool {
     @Enumerated(value=EnumType.STRING)
     private StoragePoolStatus status;
     
-    @Column(name="storage_provider", updatable=true, nullable=false)
+    // @Column(name="storage_provider", updatable=true, nullable=false)
     private String storageProvider;
     
-    @Column(name="storage_type", nullable=false)
+    // @Column(name="storage_type", nullable=false)
     private String storageType;
     
 	@Override
diff --git a/developer/pom.xml b/developer/pom.xml
index 659c4970714..236b82fdc35 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -182,7 +182,9 @@
                 </goals>
                 <configuration>
                   <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>