diff --git a/CHANGELOG b/CHANGELOG
index 08af1c3..f6dac82 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.0.84......Minor GUI fixes, revert makewhatis file addition.
 1.0.83......Improve jail/base update, execute fetch/install commands individually.
 1.0.82......Add missing system file to prevent makewhatis not found warning.
 1.0.81......Update GUI pages to work with later bastille releases.
diff --git a/bastille-init b/bastille-init
index e5febca..be9ccb6 100755
--- a/bastille-init
+++ b/bastille-init
@@ -391,11 +391,6 @@ include_files()
 				install -m 0555 ${SYSTEM_INCLUDE}/sum /usr/bin/sum
 			fi
 		fi
-		if [ ! -f "/usr/bin/makewhatis" ]; then
-			if [ -f "${SYSTEM_INCLUDE}/makewhatis" ]; then
-				install -m 0555 ${SYSTEM_INCLUDE}/makewhatis /usr/bin/makewhatis
-			fi
-		fi
 	else
 		sysrc -f ${CWDIR}${EXTCONF} VNET_ENABLE="NO" >/dev/null 2>&1
 	fi
diff --git a/conf/system/include/12.2/makewhatis b/conf/system/include/12.2/makewhatis
deleted file mode 100755
index 20135fc..0000000
Binary files a/conf/system/include/12.2/makewhatis and /dev/null differ
diff --git a/gui/bastille_manager_jconf.php b/gui/bastille_manager_jconf.php
index 870c568..a071ada 100644
--- a/gui/bastille_manager_jconf.php
+++ b/gui/bastille_manager_jconf.php
@@ -318,12 +318,14 @@ if ($_POST):
 						// Remove obsolete variable.
 						exec("/usr/sbin/sysrc -f $configfile -x {$jail_name_def}_AUTO_START");
 					endif;
-					$cmd = ("/usr/sbin/sysrc -f $configfile -x {$jail_name}_AUTO_START");
-					unset($output,$retval);mwexec2($cmd,$output,$retval);
-					if($retval == 0):
-						//$savemsg .= gtext("Autostart changed successfully.");
-					else:
-						$input_errors[] = gtext("Failed to disable autostart.");
+					if(exec("/usr/sbin/sysrc -f $configfile -qn {$jail_name}_AUTO_START")):
+						$cmd = ("/usr/sbin/sysrc -f $configfile -x {$jail_name}_AUTO_START");
+						unset($output,$retval);mwexec2($cmd,$output,$retval);
+						if($retval == 0):
+							//$savemsg .= gtext("Autostart changed successfully.");
+						else:
+							$input_errors[] = gtext("Failed to disable autostart.");
+						endif;
 					endif;
 				endif;
 
diff --git a/gui/bastille_manager_util.php b/gui/bastille_manager_util.php
index b870b16..26bc1db 100644
--- a/gui/bastille_manager_util.php
+++ b/gui/bastille_manager_util.php
@@ -244,13 +244,15 @@ if($_POST):
 					$container['jailname'] = $_POST['jailname'];
 					$confirm_name = $pconfig['confirmname'];
 					$item = $container['jailname'];
-					$cmd = ("/usr/sbin/sysrc -f {$configfile} -x {$item}_AUTO_START");
-					unset($output,$retval);mwexec2($cmd,$output,$retval);
-					if($retval == 0):
-						header('Location: bastille_manager_gui.php');
-						exit;
-					else:
-						$input_errors[] = gtext("Failed to set no-auto.");
+					if(exec("/usr/sbin/sysrc -f $configfile -qn {$item}_AUTO_START")):
+						$cmd = ("/usr/sbin/sysrc -f $configfile -x {$item}_AUTO_START");
+						unset($output,$retval);mwexec2($cmd,$output,$retval);
+						if($retval == 0):
+							header('Location: bastille_manager_gui.php');
+							exit;
+						else:
+							$input_errors[] = gtext("Failed to set no-auto.");
+						endif;
 					endif;
 				endif;
 				break;
diff --git a/version b/version
index 53fe5d6..7260243 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.0.83
+1.0.84