diff --git a/appveyor.yml b/appveyor.yml
index 6a84e42..3282390 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,12 +1,12 @@
 platform: x64
 environment:
  matrix:
-  - DC: dmd
-    DVersion: nightly
-    arch: x64
-  - DC: dmd
-    DVersion: nightly
-    arch: x86
+  #- DC: dmd
+  #  DVersion: nightly
+  #  arch: x64
+  #- DC: dmd
+  #  DVersion: nightly
+  #  arch: x86
   - DC: dmd
     DVersion: beta
     arch: x64
diff --git a/source/dub/generators/generator.d b/source/dub/generators/generator.d
index 34352ba..700b150 100644
--- a/source/dub/generators/generator.d
+++ b/source/dub/generators/generator.d
@@ -394,7 +394,7 @@
 	{
 		child.addVersions(parent.versions);
 		child.addDebugVersions(parent.debugVersions);
-		child.addOptions(BuildOptions(cast(BuildOptions)parent.options & inheritedBuildOptions));
+		child.addOptions(BuildOptions(parent.options & inheritedBuildOptions));
 	}
 
 	private static void mergeFromDependency(in ref BuildSettings child, ref BuildSettings parent)
diff --git a/test/interactive-remove.sh b/test/interactive-remove.sh
index 3608a2b..85053b8 100755
--- a/test/interactive-remove.sh
+++ b/test/interactive-remove.sh
@@ -2,30 +2,30 @@
 
 . $(dirname "${BASH_SOURCE[0]}")/common.sh
 
-$DUB fetch dub --version=0.9.20 && [ -d $HOME/.dub/packages/dub-0.9.20/dub ]
-$DUB fetch dub --version=0.9.21 && [ -d $HOME/.dub/packages/dub-0.9.21/dub ]
+$DUB fetch dub --version=1.9.0 && [ -d $HOME/.dub/packages/dub-1.9.0/dub ]
+$DUB fetch dub --version=1.10.0 && [ -d $HOME/.dub/packages/dub-1.10.0/dub ]
 if $DUB remove dub --non-interactive 2>/dev/null; then
     die $LINENO 'Non-interactive remove should fail'
 fi
-echo 1 | $DUB remove dub | tr -d '\n' | grep --ignore-case 'select.*0\.9\.20.*0\.9\.21.*'
-if [ -d $HOME/.dub/packages/dub-0.9.20/dub ]; then
-    die $LINENO 'Failed to remove dub-0.9.20'
+echo 1 | $DUB remove dub | tr -d '\n' | grep --ignore-case 'select.*1\.9\.0.*1\.10\.0.*'
+if [ -d $HOME/.dub/packages/dub-1.9.0/dub ]; then
+    die $LINENO 'Failed to remove dub-1.9.0'
 fi
-$DUB fetch dub --version=0.9.20 && [ -d $HOME/.dub/packages/dub-0.9.20/dub ]
+$DUB fetch dub --version=1.9.0 && [ -d $HOME/.dub/packages/dub-1.9.0/dub ]
 # EOF aborts remove
 echo -xn '' | $DUB remove dub
-if [ ! -d $HOME/.dub/packages/dub-0.9.20/dub ] || [ ! -d $HOME/.dub/packages/dub-0.9.21/dub ]; then
+if [ ! -d $HOME/.dub/packages/dub-1.9.0/dub ] || [ ! -d $HOME/.dub/packages/dub-1.10.0/dub ]; then
     die $LINENO 'Aborted dub still removed a package'
 fi
 # validates input
 echo -e 'abc\n4\n-1\n3' | $DUB remove dub
-if [ -d $HOME/.dub/packages/dub-0.9.20/dub ] || [ -d $HOME/.dub/packages/dub-0.9.21/dub ]; then
+if [ -d $HOME/.dub/packages/dub-1.9.0/dub ] || [ -d $HOME/.dub/packages/dub-1.10.0/dub ]; then
     die $LINENO 'Failed to remove all version of dub'
 fi
-$DUB fetch dub --version=0.9.20 && [ -d $HOME/.dub/packages/dub-0.9.20/dub ]
-$DUB fetch dub --version=0.9.21 && [ -d $HOME/.dub/packages/dub-0.9.21/dub ]
+$DUB fetch dub --version=1.9.0 && [ -d $HOME/.dub/packages/dub-1.9.0/dub ]
+$DUB fetch dub --version=1.10.0 && [ -d $HOME/.dub/packages/dub-1.10.0/dub ]
 # is non-interactive with --version=
 $DUB remove dub --version=\*
-if [ -d $HOME/.dub/packages/dub-0.9.20/dub ] || [ -d $HOME/.dub/packages/dub-0.9.21/dub ]; then
+if [ -d $HOME/.dub/packages/dub-1.9.0/dub ] || [ -d $HOME/.dub/packages/dub-1.10.0/dub ]; then
     die $LINENO 'Failed to non-interactively remove specified versions'
 fi
diff --git a/travis-ci.sh b/travis-ci.sh
index c7782f2..efe3203 100755
--- a/travis-ci.sh
+++ b/travis-ci.sh
@@ -10,6 +10,13 @@
     dub test --compiler=${DC} -c library-nonet
 fi
 
+function clean() {
+    # Hard reset of the DUB local folder is necessary as some tests
+    # currently don't properly clean themselves
+    rm -rf ~/.dub
+    git clean -dxf -- test
+}
+
 if [ "$COVERAGE" = true ]; then
     # library-nonet fails to build with coverage (Issue 13742)
     dub test --compiler=${DC} -b unittest-cov
@@ -18,12 +25,14 @@
     # run tests with different compilers
     DUB=`pwd`/bin/dub DC=${DC} test/run-unittest.sh
     deactivate
-    git clean -dxf -- test
+    clean
+
     export FRONTEND=2.077
     source $(~/dlang/install.sh ldc-1.7.0 --activate)
     DUB=`pwd`/bin/dub DC=${DC} test/run-unittest.sh
     deactivate
-    git clean -dxf -- test
+    clean
+
     export FRONTEND=2.068
     source $(~/dlang/install.sh gdc-4.8.5 --activate)
     DUB=`pwd`/bin/dub DC=${DC} test/run-unittest.sh