diff --git a/plugins/builder-dockerfile/builder-build b/plugins/builder-dockerfile/builder-build
index 5677fdaed..7ff239b92 100755
--- a/plugins/builder-dockerfile/builder-build
+++ b/plugins/builder-dockerfile/builder-build
@@ -20,6 +20,7 @@ trigger-builder-dockerfile-builder-build() {
   pushd "$SOURCECODE_WORK_DIR" &>/dev/null
 
   # extract first port from Dockerfile
+  dos2unix Dockerfile
   local DOCKERFILE_PORTS=$(get_dockerfile_exposed_ports Dockerfile)
   [[ -n "$DOCKERFILE_PORTS" ]] && config_set --no-restart "$APP" DOKKU_DOCKERFILE_PORTS="$DOCKERFILE_PORTS"
   plugn trigger pre-build-dockerfile "$APP"
diff --git a/plugins/storage/functions b/plugins/storage/functions
index 86d3b096e..f6d87e8bb 100755
--- a/plugins/storage/functions
+++ b/plugins/storage/functions
@@ -7,7 +7,7 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
 verify_paths() {
   declare desc="verifies storage paths"
   local -r passed_path=$1
-  if [[ "$passed_path" = /* ]]; then
+  if [[ "$passed_path" == /* ]]; then
     echo "$passed_path" | grep -qe '^/.*\:/' || dokku_log_fail "Storage path must be two valid paths divided by colon."
   else
     echo "$passed_path" | grep -qe '^[a-zA-Z0-9]\{1\}[a-zA-Z0-9_.-]\+\:\/' || dokku_log_fail "Volume name must be two characters or more. Volume name must not contain invalid characters. Storage path must be two valid paths divided by colon."