diff --git a/client/pom.xml b/client/pom.xml
index e98257a26d4..fb259ffb0b6 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -122,7 +122,7 @@
           </connectors>
           <contextPath>/client</contextPath>
           <webXml>${basedir}/WEB-INF/web.xml</webXml>
-          <webAppSourceDirectory>${basedir}/target/generated-webapp</webAppSourceDirectory>
+          <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
         </configuration>
       </plugin>
       <plugin>
@@ -130,7 +130,7 @@
         <artifactId>tomcat7-maven-plugin</artifactId>
         <configuration>
           <tomcatWebXml>${basedir}/WEB-INF/web.xml</tomcatWebXml>
-          <warSourceDirectory>./target/generated-webapp</warSourceDirectory>
+          <warSourceDirectory>${project.build.directory}/${project.build.finalName}</warSourceDirectory>
         </configuration>
       </plugin>
       <plugin>
diff --git a/client/tomcatconf/components-nonoss.xml.in b/client/tomcatconf/components-nonoss.xml.in
index e31506d3760..fbfc5cc2726 100755
--- a/client/tomcatconf/components-nonoss.xml.in
+++ b/client/tomcatconf/components-nonoss.xml.in
@@ -82,6 +82,9 @@ under the License.
 	   <dao name="NetappPool" class="com.cloud.netapp.dao.PoolDaoImpl" singleton="false"/>
 		<dao name="NetappVolume" class="com.cloud.netapp.dao.VolumeDaoImpl" singleton="false"/>
 	  <dao name="NetappLun" class="com.cloud.netapp.dao.LunDaoImpl" singleton="false"/>
+	    <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false">
+             <param name="premium">true</param>
+        </dao>
     </management-server>
     <configuration-server class="com.cloud.server.ConfigurationServerImpl" extends="components.xml:configuration-server">
         <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false">