diff --git a/services/fulltext_helpers.py b/services/fulltext_helpers.py
index 80d4264..2da6d68 100644
--- a/services/fulltext_helpers.py
+++ b/services/fulltext_helpers.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.
 
 """A set of helpers functions for fulltext search."""
 
@@ -14,8 +13,8 @@
 from google.appengine.api import search
 
 import settings
-from proto import ast_pb2
-from proto import tracker_pb2
+from mrproto import ast_pb2
+from mrproto import tracker_pb2
 from search import query2ast
 
 # GAE search API can only respond with 500 results per call.
@@ -103,7 +102,7 @@
             limit=_SEARCH_RESULT_CHUNK_SIZE, returned_fields=[], ids_only=True,
             cursor=search.Cursor())))
   except ValueError as e:
-    raise query2ast.InvalidQueryError(e.message)
+    raise query2ast.InvalidQueryError(str(e))
 
   logging.info('got %d initial results', len(response.results))
   ids = [int(result.doc_id) for result in response]