diff --git a/includes/template_class.php b/includes/template_class.php
index 2b7d8018d..87a54fb2a 100644
--- a/includes/template_class.php
+++ b/includes/template_class.php
@@ -55,9 +55,8 @@ class Template {
      *
      * @access public 
      */
-    function Template() {
+    function __construct() {
         
-        return;
     }
 	
     /**
@@ -129,8 +128,8 @@ class CachedTemplate extends Template {
      * @param $cache_id string unique cache identifier
      * @param $expire int number of seconds the cache will live
      */
-    function CachedTemplate($cache_id = null, $expire = 900) {
-        $this->Template();
+    function __construct($cache_id = null, $expire = 900) {
+        parent::__construct();
         $this->cache_id = $cache_id ? 'cache/' . md5($cache_id) : $cache_id;
         $this->expire   = $expire;
     }
diff --git a/modules/base/classes/widget.php b/modules/base/classes/widget.php
index 337c68733..eb5de1f03 100644
--- a/modules/base/classes/widget.php
+++ b/modules/base/classes/widget.php
@@ -177,11 +177,9 @@ function getMetric($name) {
 
 class owa_widgetView extends owa_view {
 	
-	function owa_widgetView() {
+	function __construct() {
 		
-		$this->owa_view();
-		
-		return;
+		return parent::__construct();
 	}
 	
 	function render($data) {
diff --git a/modules/base/templates/options_general.tpl b/modules/base/templates/options_general.tpl
index 4157379ae..96a28622f 100644
--- a/modules/base/templates/options_general.tpl
+++ b/modules/base/templates/options_general.tpl
@@ -85,7 +85,7 @@
 	
 	<div class="setting" id="p3p_policy">	
 		<div class="title">P3P Compact Privacy Policy</div>
-		<div class="description">This setting controls the P3P compact privacy policy that is returned to the browser when OWA sets cookies. Click <a href="http://www.p3pwriter.com/LRN_111.asp">here</a> for more information on compact privacy policies and choosing the right one for your web site.</div>
+		<div class="description">This setting controls the P3P compact privacy policy that is returned to the browser when OWA sets cookies. Click <a href="https://www.w3.org/P3P/">here</a> for more information on compact privacy policies and choosing the right one for your web site.</div>
 		<div class="field"><input type="text" size="50" name="<?php echo $this->getNs();?>config[base.p3p_policy]" value="<?php $this->out( $config['p3p_policy'] );?>"></div>
 	</div>