diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index 0cb44f2..c1639b3 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -308,6 +308,19 @@ if [ -n "$SET_ARCH" ] ; then
       RELEASE_ARCH=${RELEASE_ARCH:=armel}
       KERNEL_IMAGE=${KERNEL_IMAGE:=kernel.img}
       CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabi-}
+	  
+	  if [ $ENABLE_XORG = true ] ; then
+	    if [$RELEASE = "stretch" ] || [$RELEASE = "oldstable" ] ; then
+	      printf "\nBest support for armel architecture is provided under Debian stretch/oldstable. Choose yes to change release to Debian stretch[y/n] "
+	      read -r confirm
+          if [ "$confirm" = "y" ] ; then
+		    $RELEASE = "stretch"
+		  fi
+	    fi
+	  fi
+
+  # Make sure all missing required packages are installed
+  apt-get update && apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"`
     fi
 
     # Raspberry Pi model specific settings
diff --git a/templates/RPI3+ b/templates/RPI3+
index 00e2fd4..e1497fc 100644
--- a/templates/RPI3+
+++ b/templates/RPI3+
@@ -56,14 +56,15 @@ ENABLE_XORG=false
 ENABLE_RSYSLOG=true
 ENABLE_HWRANDOM=true
 ENABLE_IPV6=true
-ENABLE_DHCP=false
+ENABLE_WIFI_DHCP=false
+ENABLE_WIFI_DHCP
 ENABLE_KEYGEN=true
 
-NET_ADDRESS=192.168.1.101/24
-NET_GATEWAY=192.168.1.1
-NET_DNS_1=192.168.1.3
-#NET_DNS_2=192.168.1.1
-NET_DNS_DOMAINS=
+NET_ETH_ADDRESS=192.168.1.101/24
+NET_ETH_GATEWAY=192.168.1.1
+NET_ETH_DNS_1=192.168.1.3
+#NET_ETH_DNS_2=192.168.1.1
+NET_ETH_DNS_DOMAINS=
 NTP=192.168.1.2
 
 ENABLE_REDUCE=true