diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index c29dedf7..a1a7950b 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -2060,7 +2060,11 @@ class Smarty
 
         fwrite($fd, $contents);
         fclose($fd);
-		rename($_tmp_file, $filename);
+		// Win32 can't rename over top another file
+		if(strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' && file_exists($filename)) {
+			@unlink($filename);
+		} 
+		@rename($_tmp_file, $filename);
         chmod($filename, $this->_file_perms);
 
         return true;
diff --git a/libs/plugins/function.html_image.php b/libs/plugins/function.html_image.php
index b53caf0b..081ddfd7 100644
--- a/libs/plugins/function.html_image.php
+++ b/libs/plugins/function.html_image.php
@@ -25,11 +25,11 @@ function smarty_function_html_image($params, &$smarty)
 {	
 	$name = '';
 	$border = 0;
-	$height = null;
-	$width = null;
+	$height = '';
+	$width = '';
 	$extra = '';
 	$basedir = isset($GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT'])
-			? $GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT'] : null;
+			? $GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT'] : '/';
 	
 	foreach($params as $_key => $_val) {	
 		switch($_key) {
@@ -46,7 +46,8 @@ function smarty_function_html_image($params, &$smarty)
 				$width = $_val;
 				break;
 			default:
-				$extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';					
+				$extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
+				break;					
 		}
 	}