diff --git a/view/SSTemplateParser.php b/view/SSTemplateParser.php
index 62d347e12..754d66de9 100644
--- a/view/SSTemplateParser.php
+++ b/view/SSTemplateParser.php
@@ -3913,7 +3913,7 @@ class SSTemplateParser extends Parser {
 
 
 
-	/* Comment: "<%--" (!"--%>" /./)+ "--%>" */
+	/* Comment: "<%--" (!"--%>" /(?s)./)+ "--%>" */
 	protected $match_Comment_typestack = array('Comment');
 	function match_Comment ($stack = array()) {
 		$matchrule = "Comment"; $result = $this->construct($matchrule, $matchrule, null);
diff --git a/view/SSTemplateParser.php.inc b/view/SSTemplateParser.php.inc
index 151e24b61..bedcc2112 100644
--- a/view/SSTemplateParser.php.inc
+++ b/view/SSTemplateParser.php.inc
@@ -804,7 +804,7 @@ class SSTemplateParser extends Parser {
 	 * @deprecated
 	 */
 	function ClosedBlock_Handle_Control(&$res) {
-		Deprecation::notice('3.1', 'Use <% with %> or <% loop %> instead.');
+		Deprecation::notice('3.1', '<% control %> is deprecated. Use <% with %> or <% loop %> instead.');
 		return $this->ClosedBlock_Handle_Loop($res);
 	}
 	
@@ -1002,7 +1002,7 @@ class SSTemplateParser extends Parser {
 		// non-dynamically calculated
 		$text = preg_replace(
 			'/href\s*\=\s*\"\#/', 
-			'href="\' . (SSViewer::$options[\'rewriteHashlinks\'] ? strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") . 
+			'href="\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ? strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") . 
 				\'#',
 			$text
 		);