diff --git a/resources/www/index.php b/resources/www/index.php
index 6cfa7a3b63..e9e3d4d1b9 100644
--- a/resources/www/index.php
+++ b/resources/www/index.php
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /**
  * This is the source for <http://www.phabricator.com/>.
  */
@@ -20,11 +36,11 @@ if ($host == 'secure.phabricator.com') {
   <body>
     <h1>Phabricator</h1>
     <ul>
-      <li><a href="https://secure.phabricator.com/">Phabricator	Install for Phabricator Development</a></li>
+      <li><a href="https://secure.phabricator.com/">Phabricator Install for Phabricator Development</a></li>
       <li><a href="docs/libphutil/">Libphutil Docs</a></li>
       <li><a href="docs/arcanist/">Arcanist Docs</a></li>
       <li><a href="docs/phabricator/">Phabricator Docs</a></li>
       <li><a href="docs/javelin/">Javelin Docs</a></li>
     </ul>
-  </body> 
+  </body>
 </html>
diff --git a/src/applications/base/controller/base/PhabricatorController.php b/src/applications/base/controller/base/PhabricatorController.php
index fdcc24e356..c99797ac8c 100644
--- a/src/applications/base/controller/base/PhabricatorController.php
+++ b/src/applications/base/controller/base/PhabricatorController.php
@@ -56,7 +56,7 @@ abstract class PhabricatorController extends AphrontController {
     }
 
     if ($this->shouldRequireLogin() && !$user->getPHID()) {
-      $login_controller = new PhabricatorLoginController($request);
+      $login_controller = newv('PhabricatorLoginController', array($request));
       return $this->delegateToController($login_controller);
     }
   }
diff --git a/src/applications/base/controller/base/__init__.php b/src/applications/base/controller/base/__init__.php
index fa8ccfb02f..b53e9c20bc 100644
--- a/src/applications/base/controller/base/__init__.php
+++ b/src/applications/base/controller/base/__init__.php
@@ -9,11 +9,12 @@
 phutil_require_module('phabricator', 'aphront/console/core');
 phutil_require_module('phabricator', 'aphront/controller');
 phutil_require_module('phabricator', 'aphront/response/webpage');
-phutil_require_module('phabricator', 'applications/auth/controller/login');
 phutil_require_module('phabricator', 'applications/people/storage/user');
 phutil_require_module('phabricator', 'infrastructure/env');
 phutil_require_module('phabricator', 'storage/queryfx');
 phutil_require_module('phabricator', 'view/page/standard');
 
+phutil_require_module('phutil', 'utils');
+
 
 phutil_require_source('PhabricatorController.php');
diff --git a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
index 94c3f7db00..dcc6d4ea2a 100644
--- a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
@@ -54,7 +54,8 @@ class DifferentialRevisionViewController extends DifferentialController {
       $this->getImplicitComments($revision),
       $comments);
 
-    $inlines = $this->loadInlineComments($comments, $changesets);
+    $all_changesets = $changesets;
+    $inlines = $this->loadInlineComments($comments, $all_changesets);
 
     $object_phids = array_merge(
       $revision->getReviewers(),
@@ -116,7 +117,7 @@ class DifferentialRevisionViewController extends DifferentialController {
     $comment_view->setComments($comments);
     $comment_view->setHandles($handles);
     $comment_view->setInlineComments($inlines);
-    $comment_view->setChangesets($changesets);
+    $comment_view->setChangesets($all_changesets);
     $comment_view->setUser($user);
 
     $diff_history = new DifferentialRevisionUpdateHistoryView();
