diff --git a/python/google/protobuf/internal/reflection_test.py b/python/google/protobuf/internal/reflection_test.py
index b569b61f..c8e60005 100755
--- a/python/google/protobuf/internal/reflection_test.py
+++ b/python/google/protobuf/internal/reflection_test.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # Protocol Buffers - Google's data interchange format
 # Copyright 2008 Google Inc.  All rights reserved.
 # http://code.google.com/p/protobuf/
@@ -28,10 +30,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# -*- coding: utf-8 -*-
-#
-# Copyright 2007 Google Inc. All Rights Reserved.
-
 """Unittest for reflection.py, which also indirectly tests the output of the
 pure-Python protocol compiler.
 """
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc
index 3b018517..0f243ce5 100644
--- a/src/google/protobuf/descriptor.cc
+++ b/src/google/protobuf/descriptor.cc
@@ -2208,7 +2208,7 @@ template<class DescriptorT> void DescriptorBuilder::AllocateOptions(
 }
 
 // We specialize for FileDescriptor.
-template<> void DescriptorBuilder::AllocateOptions(
+template<> void DescriptorBuilder::AllocateOptions<FileDescriptor>(
     const FileDescriptor::OptionsType& orig_options,
     FileDescriptor* descriptor) {
   // We add the dummy token so that LookupSymbol does the right thing.