diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php
index ec5287690..5222ea101 100644
--- a/e107_handlers/comment_class.php
+++ b/e107_handlers/comment_class.php
@@ -481,7 +481,9 @@ class comment
 			$COMMENT_TEMPLATE['item'] = str_replace("row", "row-fluid", $COMMENT_TEMPLATE['item']);
 		}
 			
-			
+
+		e107::getParser()->setThumbSize(100,100); // BC FIx.  Set a default image size, in case the template doesn't have one.
+
 		if (vartrue($pref['nested_comments']))
 		{
 		//	$width2 = 100 - $width;
@@ -1150,7 +1152,7 @@ class comment
 		{
 			$comment = $ns->tablerender(COMLAN_9, $comment, 'comment', true );
 		}
-		
+
 		
 		
 
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 7f5b626ba..d7561078e 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -1431,7 +1431,7 @@ class e_parse extends e_parser
 				$linktext = (!empty($textReplace)) ? $textReplace : '\\2';
 				$external = (!empty($opts['ext'])) ? 'rel="external"' : '';
 
-				$text = preg_replace("#(^|[\s])([\w]+?://(?:[\w-%]+?)(?:\.[\w-%]+?)+.*?)(?=$|[\s[\]<]|\.\s|\.$|,\s|,$)#is", "\\1<a class=\"e-url\" href=\"\\2\" ".$external.">".$linktext."</a>", $text);
+				$text = preg_replace("#(^|[\s]|&nbsp;)([\w]+?:\/\/(?:[\w-%]+?)(?:\.[\w-%]+?)+.*?)(?=$|[\s[\]<]|\.\s|\.$|,\s|,$|&nbsp;)#is", "\\1<a class=\"e-url\" href=\"\\2\" ".$external.">".$linktext."</a>", $text);
 				$text = preg_replace("#(^|[\s])((?:www|ftp)(?:\.[\w-%]+?){2}.*?)(?=$|[\s[\]<]|\.\s|\.$|,\s|,$)#is", "\\1<a class=\"e-url\" href=\"http://\\2\" ".$external.">".$linktext."</a>", $text);
 
 				break;