diff --git a/lib/general b/lib/general
index 2c2be14..6dc74f1 100644
--- a/lib/general
+++ b/lib/general
@@ -117,7 +117,10 @@ pre_install() {
 	sudo apt-get -qq update
 	if [[ $(conf_read pre-packs) != true ]]; then
 		# Check for missing essential packages
-		sudo apt-get -y -qq install software-properties-common python-software-properties pwgen unzip
+		sudo apt-get -y -qq install software-properties-common
+		sudo apt-get -y -qq install python-software-properties
+		sudo apt-get -y -qq install pwgen
+		sudo apt-get -y -qq install unzip
 		conf_write pre-packs true
 	fi
 }
@@ -129,12 +132,13 @@ mysql_client_install() {
 	case "$osname" in
 		"trusty")
 			sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
+			sudo add-apt-repository "deb [arch=amd64,i386,ppc64el] http://mirrors.syringanetworks.net/mariadb/repo/10.2/ubuntu $osname main"
 		;;
 		"xenial"|"zesty"|"artful")
 			sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8
+			sudo add-apt-repository "deb [arch=amd64,i386,ppc64el] http://mirrors.syringanetworks.net/mariadb/repo/10.2/ubuntu $osname main"
 		;;
 	esac
-	sudo add-apt-repository "deb [arch=amd64,i386,ppc64el] http://mirrors.syringanetworks.net/mariadb/repo/10.2/ubuntu $osname main"
 	pre_install
 	sudo apt-get -y install mariadb-client
 	conf_write mysql-client true
diff --git a/lib/install b/lib/install
index 0fe6c4f..ee49bcb 100644
--- a/lib/install
+++ b/lib/install
@@ -438,6 +438,10 @@ swap_create() {
 		else
 			# Create SWAP Partition
 			sudo dd if=/dev/zero of=/swapfile bs=${newswap}M count=1024
+			
+			sudo chown root:root /swapfile
+			sudo chmod 0600 /swapfile
+			
 			sudo mkswap /swapfile
 			sudo swapon /swapfile
 
@@ -446,9 +450,6 @@ swap_create() {
 			echo 10 | sudo tee /proc/sys/vm/swappiness
 			echo vm.swappiness = 10 | sudo tee -a /etc/sysctl.conf
 
-			sudo chown root:root /swapfile
-			sudo chmod 0600 /swapfile
-
 			# Swap created by Webinoly - so we should remove it in uninstall
 			conf_write swap-owner webinoly
 
diff --git a/weby b/weby
index c706099..a59a18a 100644
--- a/weby
+++ b/weby
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Webinoly Installation Script.
-webyversion="1.4.0"
+webyversion="1.4.1-beta"
 
 
 # Check OS support