diff --git a/pandora_console/include/help/clippy/homepage.php b/pandora_console/include/help/clippy/homepage.php
index b166adcb2e..8ba7ac2f57 100644
--- a/pandora_console/include/help/clippy/homepage.php
+++ b/pandora_console/include/help/clippy/homepage.php
@@ -146,14 +146,22 @@ function clippy_start_page_homepage() {
 		}
 		
 		function set_clippy_annoying() {
-			checked = $('input[name=\'clippy_is_annoying\']').is(':checked');
+			var now = new Date();
+			var time = now.getTime();
+			var expireTime = time + 3600000 * 24 * 360 * 20;
+			now.setTime(expireTime);
+			
+			checked = $('input[name=\'clippy_is_annoying\']')
+				.is(':checked');
 			//intro_homepage.exit();
 			
 			if (checked) {
-				document.cookie = 'clippy_is_annoying=1';
+				document.cookie = 'clippy_is_annoying=1;expires=' +
+					now.toGMTString() + ';';
 			}
 			else {
-				document.cookie = 'clippy_is_annoying=0';
+				document.cookie = 'clippy_is_annoying=0;expires=' +
+					now.toGMTString() + ';';
 			}
 		}
 		
diff --git a/pandora_server/util/recon_scripts/snmp-recon.pl b/pandora_server/util/recon_scripts/snmp-recon.pl
index b19488fce5..f8ffb2a7e7 100755
--- a/pandora_server/util/recon_scripts/snmp-recon.pl
+++ b/pandora_server/util/recon_scripts/snmp-recon.pl
@@ -37,6 +37,7 @@ if ($OSNAME eq "freebsd") {
 		'pandora_path' => '/usr/local/etc/pandora/pandora_server.conf',
 		'icmp_checks' => 1,
 		'networktimeout' => 2,
+		'snmp_timeout' => 2,
 		'recon_timing_template' => 3,
 		'PID' => '',
 		'quiet' => 1,
@@ -47,6 +48,7 @@ if ($OSNAME eq "freebsd") {
 		'pandora_path' => '/etc/pandora/pandora_server.conf',
 		'icmp_checks' => 1,
 		'networktimeout' => 2,
+		'snmp_timeout' => 2,
 		'recon_timing_template' => 3,
 		'PID' => '',
 		'quiet' => 1,
@@ -181,7 +183,7 @@ sub responds_to_snmp($) {
 	my ($target) = @_;
 
 	foreach my $community (@SNMP_COMMUNITIES) {
-		`snmpwalk -M/dev/null -r2 -t0.1 -v1 -On -Oe -c $community $target .0 2>/dev/null`;
+		`snmpwalk -M/dev/null -r2 -t$CONF{'snmp_timeout'} -v1 -On -Oe -c $community $target .0 2>/dev/null`;
 		if ($? == 0) {
 			$COMMUNITIES{$target} = $community;
 			return $community;
@@ -198,7 +200,7 @@ sub snmp_get($$$) {
 	my ($target, $community, $oid) = @_;
 	my @output;
 
-	@output = `snmpwalk -M/dev/null -r2 -t0.1 -v1 -On -Oe -c $community $target $oid 2>/dev/null`;
+	@output = `snmpwalk -M/dev/null -r2 -t$CONF{'snmp_timeout'}  -v1 -On -Oe -c $community $target $oid 2>/dev/null`;
 	return @output;
 }