diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php
index 7f4a2d176..0acd5c109 100644
--- a/e107_handlers/shortcode_handler.php
+++ b/e107_handlers/shortcode_handler.php
@@ -12,9 +12,9 @@
 | GNU General Public License (http://gnu.org).
 |
 | $Source: /cvs_backup/e107_0.8/e107_handlers/shortcode_handler.php,v $
-| $Revision: 1.24 $
-| $Date: 2009-01-25 17:44:13 $
-| $Author: mcfly_e107 $
+| $Revision: 1.25 $
+| $Date: 2009-02-03 11:58:36 $
+| $Author: lisa_ $
 +----------------------------------------------------------------------------+
 */
 
@@ -95,7 +95,7 @@ class e_shortcode
 		$this->parseSCFiles = true;			// Default probably never used, but make sure its defined.
 
 		//Register any shortcode from the shortcode/override/ directory
-		if($pref['sc_override'])
+		if(varset($pref['sc_override']))
 		{
 			$tmp = explode(',', $pref['sc_override']);
 			foreach($tmp as $code)
diff --git a/e107_plugins/linkwords/e_tohtml.php b/e107_plugins/linkwords/e_tohtml.php
index d8236d3c8..b856b77e8 100755
--- a/e107_plugins/linkwords/e_tohtml.php
+++ b/e107_plugins/linkwords/e_tohtml.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/e_tohtml.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2008-12-13 18:04:52 $
-|     $Author: e107steved $
+|     $Revision: 1.5 $
+|     $Date: 2009-02-03 11:59:02 $
+|     $Author: lisa_ $
 |
 | *utf - flags functions which need utf-8-aware code
 TODO:
@@ -27,7 +27,7 @@ TODO:
 if (!defined('e107_INIT')) { exit; }
 if (!plugInstalled('linkwords')) exit;
 
-define('LW_CACHE_ENABLE', TRUEE);
+define('LW_CACHE_ENABLE', TRUE);
 define('LW_CACHE_TAG', 'nomd5_linkwords');
 
 class e_tohtml_linkwords
diff --git a/e107_themes/templates/header_default.php b/e107_themes/templates/header_default.php
index 9f36ac589..196cf12d6 100644
--- a/e107_themes/templates/header_default.php
+++ b/e107_themes/templates/header_default.php
@@ -6,9 +6,9 @@
 |     Released under the terms and conditions of the GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
-|     $Revision: 1.26 $
-|     $Date: 2008-12-04 21:05:05 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.27 $
+|     $Date: 2009-02-03 11:59:12 $
+|     $Author: lisa_ $
 +-----------------------------------------------------------------------------------------------+
 */
 
@@ -378,6 +378,7 @@ $js_body_onload = array();//'externalLinks();'; - already registered to e107:loa
 
 // Theme JS
 if (defined('THEME_ONLOAD')) $js_body_onload[] = THEME_ONLOAD;
+$body_onload='';
 if (count($js_body_onload)) $body_onload = " onload=\"".implode(" ",$js_body_onload)."\"";
 
 //
@@ -445,7 +446,7 @@ if ($e107_popup != 1) {
 //
 // M: Send top of body for custom pages and for news
 //
-	$def = $pref['theme_deflayout'];
+	$def = varset($pref['theme_deflayout']);
 	if(is_array($HEADER) && isset($HEADER[$def]) && isset($FOOTER[$def]))
 	{
 		$HEADER = $HEADER[$def];