--- lib/error.php.orig	2012-01-17 14:06:14.000000000 +0100
+++ lib/error.php	2012-01-17 14:04:12.000000000 +0100
@@ -20,7 +20,7 @@
 		$message = "<p>$message</p>";
 
 		ob_start();
-		include_once TPLPATH . $template . '.php';
+		include_once DIRNAME . BASENAME . '/' . TPLPATH . $template . '.php';
 		$buffer = ob_get_contents();
 		ob_end_clean();
 		return $buffer;
@@ -38,7 +38,7 @@
 		$login = $message;
 
 		ob_start();
-		include_once TPLPATH . $template . '.php';
+		include_once DIRNAME . BASENAME . '/' . TPLPATH . $template . '.php';
 		$buffer = ob_get_contents();
 		ob_end_clean();
 		return $buffer;
--- common.php.orig	2012-01-17 14:08:47.000000000 +0100
+++ common.php	2012-01-17 14:09:08.000000000 +0100
@@ -137,7 +137,7 @@
 function show_error($message='')
 {
 	// we'll use the default language for this
-	$lang =& load_class('lang', TRUE, 'lib');
+	$lang =& load_class('lang', TRUE, 'lang');
 	$lang->setlang(); // get the default strings
 
 	$message = $lang->word($message);
@@ -153,7 +153,7 @@
 function show_login($message='')
 {
 	// we'll use the default language for this
-	$lang =& load_class('lang',TRUE,'lib');
+	$lang =& load_class('lang',TRUE,'lang');
 	$lang->setlang(); // get the default strings
 
 	$login = "<form method='post' action=''>