diff --git a/rosidl_adapter_proto/cmake/rosidl_adapter_proto-extras.cmake.in b/rosidl_adapter_proto/cmake/rosidl_adapter_proto-extras.cmake.in
index 24acbaa..66d4339 100644
--- a/rosidl_adapter_proto/cmake/rosidl_adapter_proto-extras.cmake.in
+++ b/rosidl_adapter_proto/cmake/rosidl_adapter_proto-extras.cmake.in
@@ -49,4 +49,4 @@ else()
     endif()
   endforeach()
 
-endif()
\ No newline at end of file
+endif()
diff --git a/rosidl_typesupport_protobuf/rosidl_typesupport_protobuf/__init__.py b/rosidl_typesupport_protobuf/rosidl_typesupport_protobuf/__init__.py
index a790484..0d0c0d0 100644
--- a/rosidl_typesupport_protobuf/rosidl_typesupport_protobuf/__init__.py
+++ b/rosidl_typesupport_protobuf/rosidl_typesupport_protobuf/__init__.py
@@ -67,7 +67,7 @@ def ros_message_functions_header_c(package_name, interface_path):
   return f"{include_base}__functions.h"
 
 def ros_message_functions_header_c_from_namespace(namespace, name):
-  include_parts = namespace;
+  include_parts = list(namespace)
   if CURRENT_DISTRO >= DISTROS["foxy"]:
      include_parts += ["detail"]
   include_parts += [convert_camel_case_to_lower_case_underscore(name)]
diff --git a/rosidl_typesupport_protobuf_c/rosidl_typesupport_protobuf_c/__init__.py b/rosidl_typesupport_protobuf_c/rosidl_typesupport_protobuf_c/__init__.py
index 1be76da..858abe2 100644
--- a/rosidl_typesupport_protobuf_c/rosidl_typesupport_protobuf_c/__init__.py
+++ b/rosidl_typesupport_protobuf_c/rosidl_typesupport_protobuf_c/__init__.py
@@ -1,6 +1,4 @@
-# ================================= Apache 2.0 =================================
-#
-# Copyright (C) 2021 Continental
+# Copyright 2016-2018 Open Source Robotics Foundation, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,8 +11,6 @@
 # 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.
-#
-# ================================= Apache 2.0 =================================
 
 from rosidl_cmake import generate_files
 
diff --git a/rosidl_typesupport_protobuf_cpp/resource/msg__type_support.cpp.em b/rosidl_typesupport_protobuf_cpp/resource/msg__type_support.cpp.em
index a58c86a..6476b52 100644
--- a/rosidl_typesupport_protobuf_cpp/resource/msg__type_support.cpp.em
+++ b/rosidl_typesupport_protobuf_cpp/resource/msg__type_support.cpp.em
@@ -25,8 +25,8 @@ from rosidl_typesupport_protobuf import *
 
 ros_type_ns = ros_type_namespace(package_name, interface_path)
 ros_type_name = ros_type_name(message)
-ros_type = ros_type(package_name=package_name, interface_path=interface_path, message=message)
-proto_type = protobuf_type(package_name=package_name, interface_path=interface_path, message=message)
+ros_type = ros_type(package_name, interface_path, message)
+proto_type = protobuf_type(package_name, interface_path, message)
 
 system_header_files = [
     'string',