diff --git a/src/datastore_mad/remotes/lxd_downloader.sh b/src/datastore_mad/remotes/lxd_downloader.sh
index beebbe6e16..1859b9b8b3 100755
--- a/src/datastore_mad/remotes/lxd_downloader.sh
+++ b/src/datastore_mad/remotes/lxd_downloader.sh
@@ -102,7 +102,7 @@ selected_tag=get_tag_name
 for p in ${arguments//&/ }; do
     kvp=( ${p/=/ } );
     k=${kvp[0]};v=${kvp[1]};
-    eval $k=$v;
+    [ -n "$k" -a -n "$v" ] && eval $k=$v;
 done
 
 extension="tar.xz"
@@ -210,6 +210,8 @@ fi
 #-------------------------------------------------------------------------------
 [ -f $output ] && rm -f $output > /dev/null 2>&1
 [ -n "$id" -a -d $TMP_DIR/$id ] && rm -rf $TMP_DIR/$id > /dev/null 2>&1
-[ -f $output_raw ] rm -f $output_raw > /dev/null 2>&1
-[ -f $output_qcow ] rm -f $output_qcow > /dev/null 2>&1
+[ -f $output_raw ] && rm -f $output_raw > /dev/null 2>&1
+[ -f $output_qcow ] && rm -f $output_qcow > /dev/null 2>&1
+
+exit 0
 
diff --git a/src/mad/sh/create_container_image.sh b/src/mad/sh/create_container_image.sh
index 1f04408916..56ad19232b 100755
--- a/src/mad/sh/create_container_image.sh
+++ b/src/mad/sh/create_container_image.sh
@@ -19,6 +19,10 @@
 #-------------------------------------------------------------------------------
 # Configuration attributes and parameters
 #-------------------------------------------------------------------------------
+
+USER=oneadmin
+GROUP=oneadmin
+
 DRIVER_PATH=$(dirname $0)
 
 tmp_dir=$1
@@ -41,7 +45,7 @@ esac
 # Mount container disk image and untar rootfs contents to it
 #-------------------------------------------------------------------------------
 mount $tmp_dir/$id.raw $tmp_dir/$id
-chown oneadmin:oneadmin $tmp_dir/$id
+chown $USER:$GROUP $tmp_dir/$id
 tar $untar_options $tmp_dir/$id.$extension -C $tmp_dir/$id > /dev/null 2>&1
 
 sync