diff --git a/scripts/builder.sh b/scripts/builder.sh
index 073f57bc..d97da362 100755
--- a/scripts/builder.sh
+++ b/scripts/builder.sh
@@ -411,6 +411,7 @@ check_ssh_agent()
 
 main()
 {
+	init_variables $*
 	if [ $DOUPLOAD ]; then
 		check_ssh_agent
 	fi
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index 87de5634..f9868ebd 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -38,6 +38,7 @@ lf2crlf()
 		echo using awk to convert end of line markers in $fname
 		awk 'sub("$", "\r")' $fname > $fname".temp"
 		mv $fname".temp" $fname
+		return
 	fi
 	echo 'warning- cant change eol to cr eol'
 }