diff --git a/jinja2/lexer.py b/jinja2/lexer.py
index 8f63932..3a925bb 100644
--- a/jinja2/lexer.py
+++ b/jinja2/lexer.py
@@ -144,7 +144,7 @@
         (len(environment.block_start_string), 'block',
          e(environment.block_start_string)),
         (len(environment.variable_start_string), 'variable',
-         e(environment.variable_start_string)),
+         e(environment.variable_start_string))
     ]
 
     if environment.line_statement_prefix is not None:
@@ -152,7 +152,7 @@
                       r'^\s*' + e(environment.line_statement_prefix)))
     if environment.line_comment_prefix is not None:
         rules.append((len(environment.line_comment_prefix), 'linecomment',
-                      r'(?:^|(?<!\S))\s*' + e(environment.line_comment_prefix)))
+                      r'(?:^|(?<=\S))[^\S\r\n]*' + e(environment.line_comment_prefix)))
 
     return [x[1:] for x in sorted(rules, reverse=True)]