diff --git a/build.gradle b/build.gradle
index fe027f9b17eff761871424e02f80ee2ea11e63bc..64e6b108ee93c3be9c6d3238f1ecce8479032ac2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -140,14 +140,12 @@ dependencies {
 //	testCompile 'org.apache.jmeter:ApacheJMeter:2.+'
 }
 
-tasks.withType(JavaCompile) {
-	// adds support for compiler warnings generation
-	options.compilerArgs << '-Xlint:all,-processing'
-}
-
 tasks.withType(JavaCompile) {
 	// workaround for http://issues.gradle.org/browse/GRADLE-1230
 	doFirst { println '' }
+
+	// adds support for compiler warnings generation
+	options.compilerArgs << '-Xlint:all,-processing'
 }
 
 asciidoctor {
diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 89c19ab53e127fefffa0b9ebf8e22947178df02b..c3c6e63156291dbcd12424241e79efe8372ed5f9 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -211,8 +211,8 @@ WORKING_DIR=`pwd`
 
 fn_download()
 {
-	FILE=$1
-	URL=$2
+	FILE="$1"
+	URL="$2"
 
 	if wget --no-check-certificate -q -O /dev/null "$URL"; then
 		wget --no-check-certificate -q -O "$FILE" "$URL"
@@ -222,8 +222,8 @@ fn_download()
 # "wget -N" does not work with "-O" option... so we use a workaround here
 fn_download_newer()
 {
-	FILE=$1
-	URL=$2
+	FILE="$1"
+	URL="$2"
 
 	if  [ ! -f "$FILE" ]; then
 		if wget --no-check-certificate -q -O /dev/null "$URL"; then
@@ -234,12 +234,12 @@ fn_download_newer()
 
 fn_import_data()
 {
-	NAME=$1
-	OSM_FILE=$2
-	OSM_FILE_FILTERED=$3
-	BOUNDING=$4
-	SCHEDULE_FILE=$5
-	TABLE_PREFIX=$6
+	NAME="$1"
+	OSM_FILE="$2"
+	OSM_FILE_FILTERED="$3"
+	BOUNDING="$4"
+	SCHEDULE_FILE="$5"
+	TABLE_PREFIX="$6"
 
 	echo "Importing data for region of $NAME"
 	if $IMPORT_OSMDATA_CACHED; then