diff --git a/features/activities.py b/features/activities.py
index 35c6a64..cc8a728 100644
--- a/features/activities.py
+++ b/features/activities.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 """Code to support project and user activies pages."""
 from __future__ import print_function
@@ -20,7 +19,7 @@
 from framework import template_helpers
 from framework import timestr
 from project import project_views
-from proto import tracker_pb2
+from mrproto import tracker_pb2
 from tracker import tracker_helpers
 from tracker import tracker_views
 
@@ -93,7 +92,7 @@
       self.project = project_views.ProjectView(project)
 
     else:
-      logging.warn('unknown activity object %r', pb)
+      logging.warning('unknown activity object %r', pb)
 
     nested_page_data = {
         'activity_type': activity_type,