diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
index 0b020bb8c3b..7fc32ad3b17 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -604,14 +604,17 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
         if (url != null) {
             isoFile = new File(url.getPath());
         }
-        if (isoFile == null || !isoFile.exists()) {
-            isoFile = new File("/usr/lib64/cloud/common/" + "/vms/systemvm.iso");
-            if (!isoFile.exists()) {
-                isoFile = new File("/usr/lib/cloud/common/" + "/vms/systemvm.iso");
-            }
+
+        if(isoFile == null || !isoFile.exists()) {
+            isoFile = new File("/usr/share/cloudstack-common/vms/systemvm.iso");
         }
-        return isoFile;
-    }
+
+        assert(isoFile != null);
+        if(!isoFile.exists()) {
+               s_logger.error("Unable to locate systemvm.iso in your setup at " + isoFile.toString());
+         }
+         return isoFile;
+     }
 
     @Override
     public File getSystemVMKeyFile() {
@@ -620,14 +623,16 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
         if ( url != null ){
             keyFile = new File(url.getPath());
         }
+
         if (keyFile == null || !keyFile.exists()) {
-            keyFile = new File("/usr/lib64/cloud/common" + "/scripts/vm/systemvm/id_rsa.cloud");
-            if (!keyFile.exists()) {
-                keyFile = new File("/usr/lib/cloud/common" + "/scripts/vm/systemvm/id_rsa.cloud");
-            }
+            keyFile = new File("/usr/share/cloudstack-common/scripts/vm/systemvm/id_rsa.cloud");
         }
-        return keyFile;
-    }    
+        assert(keyFile != null);
+        if(!keyFile.exists()) {
+               s_logger.error("Unable to locate id_rsa.cloud in your setup at " + keyFile.toString());
+         }
+         return keyFile;
+     }
 
     private Runnable getHostScanTask() {
         return new Runnable() {
diff --git a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java
index 1bb3981cd72..7072324080d 100644
--- a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java
@@ -22,22 +22,17 @@ import javax.ejb.Local;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.ApiDBUtils;
-import com.cloud.api.ApiResponseHelper;
-import com.cloud.api.query.vo.InstanceGroupJoinVO;
+
 import com.cloud.api.query.vo.UserAccountJoinVO;
 
-import org.apache.cloudstack.api.response.InstanceGroupResponse;
 import org.apache.cloudstack.api.response.UserResponse;
 import org.springframework.stereotype.Component;
 
-import com.cloud.user.Account;
 import com.cloud.user.User;
 import com.cloud.user.UserAccount;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.vm.InstanceGroup;
 
 
 @Component
@@ -58,7 +53,7 @@ public class UserAccountJoinDaoImpl extends GenericDaoBase<UserAccountJoinVO, Lo
         vrIdSearch.done();
 
         vrAcctIdSearch = createSearchBuilder();
-        vrAcctIdSearch.and("accountid", vrAcctIdSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
+        vrAcctIdSearch.and("accountId", vrAcctIdSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
         vrAcctIdSearch.done();