diff --git a/pom.xml b/pom.xml
index 6cbd8fa5485..dd383d5c066 100644
--- a/pom.xml
+++ b/pom.xml
@@ -909,6 +909,7 @@
                             <exclude>**/*.iso</exclude>
                             <exclude>**/*.tgz</exclude>
                             <exclude>**/*.zip</exclude>
+                            <exclude>**/*.vhd*</exclude>
                             <exclude>**/target/**</exclude>
                             <exclude>**/.vagrant</exclude>
                             <exclude>**/*.json</exclude>
@@ -934,15 +935,7 @@
                             <exclude>debian/source/format</exclude>
                             <exclude>dist/console-proxy/js/jquery.js</exclude>
                             <exclude>plugins/hypervisors/hyperv/conf/agent.properties</exclude>
-                            <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln</exclude>
-                            <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**</exclude>
-                            <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**</exclude>
-                            <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**</exclude>
-                            <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**</exclude>
-                            <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config</exclude>
-                            <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config</exclude>
-                            <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj</exclude>
-                            <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.settings</exclude>
+                            <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**</exclude>
                             <exclude>scripts/installer/windows/acs_license.rtf</exclude>
                             <exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
                             <exclude>services/console-proxy/server/conf/agent.properties</exclude>
diff --git a/systemvm/debian/opt/cloud/bin/configure.py b/systemvm/debian/opt/cloud/bin/configure.py
index 0ddce52f885..1e0c057a871 100755
--- a/systemvm/debian/opt/cloud/bin/configure.py
+++ b/systemvm/debian/opt/cloud/bin/configure.py
@@ -67,7 +67,7 @@ class CsPassword(CsDataBag):
                 url = "http://%s:8080/" % server_ip
                 payload = {"ip": vm_ip, "password": password, "token": token}
                 data = urllib.urlencode(payload)
-                request = urllib2.Request(url, data=data, headers={"DomU_Request" : "save_password"})
+                request = urllib2.Request(url, data=data, headers={"DomU_Request": "save_password"})
                 try:
                     resp = urllib2.urlopen(request, data)
                     logging.debug("Update password server result: http:%s, content:%s" % (resp.code, resp.read()))
diff --git a/tools/travis/install.sh b/tools/travis/install.sh
index 6744979b399..1958cfa4779 100755
--- a/tools/travis/install.sh
+++ b/tools/travis/install.sh
@@ -25,14 +25,15 @@ export MAVEN_OPTS="-Xmx4096m -XX:MaxPermSize=800m -Djava.security.egd=file:/dev/
 set -e
 
 if [ $TEST_SEQUENCE_NUMBER -eq 1 ]; then
+   DIR=$(pwd)
    # Pylint/pep8 systemvm python codebase
-   cd systemvm/test && bash -x runtests.sh && cd ../..
+   cd systemvm/test && bash -x runtests.sh
    # Build noredist
-   git clone https://github.com/rhtyd/cloudstack-nonoss.git nonoss
-   cd nonoss && bash -x install-non-oss.sh && cd ..
+   git clone https://github.com/rhtyd/cloudstack-nonoss.git nonoss && cd nonoss && bash -x install-non-oss.sh
+   cd $DIR && echo $DIR
    git clean -fdx .
    # Perform rat checks
-   mvn -P developer,systemvm -Dsimulator -Dnoredist --projects='org.apache.cloudstack:cloudstack' org.apache.rat:apache-rat-plugin:0.12:check
+   mvn -P developer,systemvm -Dsimulator -Dnoredist -pl . org.apache.rat:apache-rat-plugin:0.12:check
    mvn -q -B -P developer,systemvm -Dsimulator -Dnoredist clean install
 else
    mvn -Pdeveloper -Dsimulator clean install -DskipTests -T4 | egrep "Building|Tests|SUCCESS|FAILURE"