diff --git a/demo/pubspec.yaml b/demo/pubspec.yaml
index 6ef2d83eb..05f93e865 100644
--- a/demo/pubspec.yaml
+++ b/demo/pubspec.yaml
@@ -1,8 +1,8 @@
-name: angular-dart-demo
+name: angular_dart_demo
 version: 0.0.1
 dependencies:
+  angular:
+    path: ..
   browser: any
-  unittest: any
   js: any
-  angular:
-   path: ..
+  unittest: any
diff --git a/demo/web/index.html b/demo/web/index.html
index abb9dbfe6..a857018be 100644
--- a/demo/web/index.html
+++ b/demo/web/index.html
@@ -17,10 +17,12 @@ <h1>A Demo of the Repeat Directive</h1>
     </ul>
 
     <h1>A Demo of Components</h1>
+    <!--
     <div tabs>
         <div pane title="Pane 1">Pane 1 Contents</div>
         <div pane title="Pane 2">Pane 2 Contents</div>
     </div>
+    -->
 </div>
 </body>
 </html>
diff --git a/demo/web/main.dart b/demo/web/main.dart
index 5857bdcc1..1c05bd658 100644
--- a/demo/web/main.dart
+++ b/demo/web/main.dart
@@ -35,7 +35,7 @@ class TabsController implements Controller {
   List panes;
   var selectedPanes = new Expando<dom.Node>();
 
-  MainController(Scope this.$scope) {
+  TabsController(Scope this.$scope) {
     panes = $scope.panes = [];
 
     $scope.selected = (pane) {
diff --git a/lib/scope.dart b/lib/scope.dart
index e0d70e3dc..40f8b2638 100644
--- a/lib/scope.dart
+++ b/lib/scope.dart
@@ -66,7 +66,7 @@ class Event {
   Scope currentScope;
   bool propagationStopped = false;
   bool defaultPrevented = false;
-  
+
   Event(this.name, this.targetScope);
 
   stopPropagation () => propagationStopped = true;
@@ -245,7 +245,7 @@ class Scope implements Map {
           } else {
             next = current._nextSibling;
             if (next == null) {
-              while(current !== target && (next = current._nextSibling) == null) {
+              while(current != target && (next = current._nextSibling) == null) {
                 current = current.$parent;
               }
             }
@@ -386,7 +386,7 @@ class Scope implements Map {
         } else {
           next = current._nextSibling;
           if (next == null) {
-            while(current !== target && (next = current._nextSibling) == null) {
+            while(current != target && (next = current._nextSibling) == null) {
               current = current.$parent;
             }
           }