diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh
index e11f5886..61f3090a 100755
--- a/files/initrd/opt/arc/arc-functions.sh
+++ b/files/initrd/opt/arc/arc-functions.sh
@@ -41,6 +41,7 @@ function addonSelection() {
   ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
   ADDONS="$(readConfigKey "addons" "${USER_CONFIG_FILE}")"
   DEVICENIC="$(readConfigKey "device.nic" "${USER_CONFIG_FILE}")"
+  PAT_URL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
   if [ "${ADDONS}" = "{}" ]; then
     initConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
     initConfigKey "addons.cpuinfo" "" "${USER_CONFIG_FILE}"
@@ -61,10 +62,10 @@ function addonSelection() {
       initConfigKey "addons.powersched" "" "${USER_CONFIG_FILE}"
       initConfigKey "addons.sensors" "" "${USER_CONFIG_FILE}"
     fi
-    if grep -q "i915" lsmod; then
+    if echo "$(lsmod)" 2>/dev/null | grep -q "i915" && [[ "${PLATFORM}" == "apollolake" || "${PLATFORM}" == "geminilake" ]]; then
       initConfigKey "addons.i915" "" "${USER_CONFIG_FILE}"
     fi
-    if grep -q "7.2.2" $(readConfigKey "paturl" "${USER_CONFIG_FILE}"); then
+    if echo "${PAT_URL}" 2>/dev/null | grep -q "7.2.2"; then
       initConfigKey "addons.allowdowngrade" "" "${USER_CONFIG_FILE}"
     fi
     if [ ${DEVICENIC} -gt 1 ]; then
diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
index f81bdf66..2a906826 100755
--- a/files/initrd/opt/arc/arc.sh
+++ b/files/initrd/opt/arc/arc.sh
@@ -898,7 +898,7 @@ if [ "${AUTOMATED}" == "true" ]; then
     make
   fi
 else
-  [ "${BUILDDONE}" == "true" ] && NEXT="3" || NEXT="1"
+  [ "${BUILDDONE}" == "true" ] && NEXT="3" || [ "${CONFDONE}" == "true" ] && NEXT="2" || NEXT="1"
   while true; do
     echo "= \"\Z4========== Main ==========\Zn \" "                                            >"${TMP_PATH}/menu"
     if [ -z "${ARCKEY}" ] && [ "${OFFLINE}" == "false" ]; then