diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index 767d6744f8d..a6af30d6335 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -292,8 +292,10 @@
     <copy overwrite="true" todir="${db.scripts.dir}">
       <fileset dir="${setup.db.dir}">
         <include name="**/*"/>
-        <exclude name="**/override/*"/>
       </fileset>
+      <filterset>
+        <filter token="VERSION" value="${impl.version}"/>
+      </filterset>
     </copy>
   </target>
 
diff --git a/build/developer.xml b/build/developer.xml
index d5f1ebe80e8..a8a5cf5c9b7 100755
--- a/build/developer.xml
+++ b/build/developer.xml
@@ -205,7 +205,7 @@
     </condition>
   	
     <echo message="deploydb ${server-setup.file} ${templates.file} ${DBROOTPW}" />
-    <exec dir="${setup.db.dir}" executable="bash">
+    <exec dir="${db.scripts.dir}" executable="bash">
       <arg value="deploy-db-dev.sh" />
       <arg value="${server-setup.file}" />
       <arg value="${templates.file}" />
diff --git a/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java b/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java
index 9811cb8ddb1..9888539976f 100644
--- a/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java
+++ b/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java
@@ -34,7 +34,6 @@ import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.GenericSearchBuilder;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.SearchCriteria.Func;
 import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -50,7 +49,7 @@ public class VersionDaoImpl extends GenericDaoBase<VersionVO, Long> implements V
         super();
         
         CurrentVersionSearch = createSearchBuilder(String.class);
-        CurrentVersionSearch.select(null, Func.FIRST, CurrentVersionSearch.entity().getVersion());
+        CurrentVersionSearch.selectField(CurrentVersionSearch.entity().getVersion());
         CurrentVersionSearch.and("step", CurrentVersionSearch.entity().getStep(), Op.EQ);
         CurrentVersionSearch.done();
         
@@ -62,6 +61,7 @@ public class VersionDaoImpl extends GenericDaoBase<VersionVO, Long> implements V
         
     }
     
+    @Override
     public VersionVO findByVersion(String version, Step step) {
         SearchCriteria<VersionVO> sc = AllFieldsSearch.create();
         sc.setParameters("version", version);
@@ -70,6 +70,7 @@ public class VersionDaoImpl extends GenericDaoBase<VersionVO, Long> implements V
         return findOneBy(sc);
     }
     
+    @Override
     public String getCurrentVersion() {
         Connection conn = null;
         try {
@@ -77,12 +78,12 @@ public class VersionDaoImpl extends GenericDaoBase<VersionVO, Long> implements V
             
             conn = Transaction.getStandaloneConnection();
     
-            PreparedStatement pstmt = conn.prepareStatement("SHOW TABLES LIKE 'VERSION'");
+            PreparedStatement pstmt = conn.prepareStatement("SHOW TABLES LIKE 'version'");
             ResultSet rs = pstmt.executeQuery();
             if (!rs.next()) {
                 pstmt.close();
                 rs.close();
-                pstmt = conn.prepareStatement("SHOW TABLES LIKE 'NICS'");
+                pstmt = conn.prepareStatement("SHOW TABLES LIKE 'nics'");
                 rs = pstmt.executeQuery();
                 if (!rs.next()) {
                     pstmt.close();
@@ -108,7 +109,7 @@ public class VersionDaoImpl extends GenericDaoBase<VersionVO, Long> implements V
         SearchCriteria<String> sc = CurrentVersionSearch.create();
         
         sc.setParameters("step", Step.Complete);
-        Filter filter = new Filter(VersionVO.class, "updated", true, 0l, 1l);
+        Filter filter = new Filter(VersionVO.class, "id", true, 0l, 1l);
         
         List<String> vers = customSearch(sc, filter);
         return vers.get(0);
diff --git a/utils/src/com/cloud/utils/component/ComponentLocator.java b/utils/src/com/cloud/utils/component/ComponentLocator.java
index f40eac4ecde..87e4b7662d6 100755
--- a/utils/src/com/cloud/utils/component/ComponentLocator.java
+++ b/utils/src/com/cloud/utils/component/ComponentLocator.java
@@ -374,7 +374,7 @@ public class ComponentLocator implements ComponentLocatorMBean {
             if (info.singleton) {
                 Singleton s = s_singletons.get(info.clazz);
                 if (s.state == Singleton.State.Instantiated) {
-                    s_logger.info("Injecting singleton Manager: " + info.name);
+                    s_logger.debug("Injecting singleton Manager: " + info.name);
                     inject(info.clazz, info.instance);
                     s.state = Singleton.State.Injected;
                 }