diff --git a/rosserial_chibios/src/rosserial_chibios/make_libraries.py b/rosserial_chibios/src/rosserial_chibios/make_libraries.py
index 2bc21b803..7016f8081 100755
--- a/rosserial_chibios/src/rosserial_chibios/make_libraries.py
+++ b/rosserial_chibios/src/rosserial_chibios/make_libraries.py
@@ -51,6 +51,7 @@
 # for copying files
 import shutil
 import os.path
+import sys
 
 ROS_TO_EMBEDDED_TYPES = {
     'bool'    :   ('bool',              1, PrimitiveDataType, []),
diff --git a/rosserial_client/CMakeLists.txt b/rosserial_client/CMakeLists.txt
index 41cdd1048..6bf02f016 100644
--- a/rosserial_client/CMakeLists.txt
+++ b/rosserial_client/CMakeLists.txt
@@ -22,6 +22,6 @@ install(
 )
 
 catkin_install_python(
-  PROGRAMS scripts/make_libraries src/${PROJECT_NAME}/make_library.py
+  PROGRAMS scripts/make_libraries.py src/${PROJECT_NAME}/make_library.py
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
diff --git a/rosserial_client/scripts/make_libraries b/rosserial_client/scripts/make_libraries.py
similarity index 99%
rename from rosserial_client/scripts/make_libraries
rename to rosserial_client/scripts/make_libraries.py
index 98390c082..93ee1b09d 100755
--- a/rosserial_client/scripts/make_libraries
+++ b/rosserial_client/scripts/make_libraries.py
@@ -55,7 +55,7 @@
 from rosserial_client.make_library import *
 
 # for copying files
-import shutil
+import sys
 import os.path
 
 ROS_TO_EMBEDDED_TYPES = {
diff --git a/rosserial_embeddedlinux/src/rosserial_embeddedlinux/make_libraries.py b/rosserial_embeddedlinux/src/rosserial_embeddedlinux/make_libraries.py
index 636bd3991..8185c4983 100755
--- a/rosserial_embeddedlinux/src/rosserial_embeddedlinux/make_libraries.py
+++ b/rosserial_embeddedlinux/src/rosserial_embeddedlinux/make_libraries.py
@@ -49,6 +49,7 @@
 # for copying files
 import shutil
 import os.path
+import sys
 
 ROS_TO_EMBEDDED_TYPES = {
     'bool'    :   ('bool',              1, PrimitiveDataType, []),
diff --git a/rosserial_mbed/src/rosserial_mbed/make_libraries.py b/rosserial_mbed/src/rosserial_mbed/make_libraries.py
index dc0784389..5d63e55f3 100755
--- a/rosserial_mbed/src/rosserial_mbed/make_libraries.py
+++ b/rosserial_mbed/src/rosserial_mbed/make_libraries.py
@@ -49,6 +49,7 @@
 # for copying files
 import shutil
 import os.path
+import sys
 
 ROS_TO_EMBEDDED_TYPES = {
     'bool'    :   ('bool',              1, PrimitiveDataType, []),
diff --git a/rosserial_test/scripts/generate_client_ros_lib.py b/rosserial_test/scripts/generate_client_ros_lib.py
index f16375afb..3a9ab43b8 100644
--- a/rosserial_test/scripts/generate_client_ros_lib.py
+++ b/rosserial_test/scripts/generate_client_ros_lib.py
@@ -7,9 +7,9 @@
 
 import rospkg
 from rosserial_client.make_library import *
-from shutil import copytree
 from os import path, sep, walk
 import re
+import sys
 
 ROS_TO_EMBEDDED_TYPES = {
     'bool'    :   ('bool',              1, PrimitiveDataType, []),
@@ -49,7 +49,7 @@
 # the same name.
 for dname, dirs, files in walk(path):
     for fname in files:
-        fpath = os.path.join(dname, fname)
+        fpath = path.join([dname, fname])
         with open(fpath) as f:
             s = f.read()
         with open(fpath, "w") as f:
diff --git a/rosserial_vex_cortex/src/rosserial_vex_cortex/make_libraries.py b/rosserial_vex_cortex/src/rosserial_vex_cortex/make_libraries.py
index 74f00cae3..9951ef70d 100755
--- a/rosserial_vex_cortex/src/rosserial_vex_cortex/make_libraries.py
+++ b/rosserial_vex_cortex/src/rosserial_vex_cortex/make_libraries.py
@@ -48,6 +48,7 @@
 # for copying files
 import shutil
 import os.path
+import sys
 
 ROS_TO_EMBEDDED_TYPES = {
     'bool'    :   ('bool',              1, PrimitiveDataType, []),
diff --git a/rosserial_vex_v5/src/rosserial_vex_v5/make_libraries.py b/rosserial_vex_v5/src/rosserial_vex_v5/make_libraries.py
index 7cb055b37..27ccde1b8 100755
--- a/rosserial_vex_v5/src/rosserial_vex_v5/make_libraries.py
+++ b/rosserial_vex_v5/src/rosserial_vex_v5/make_libraries.py
@@ -48,6 +48,7 @@
 # for copying files
 import shutil
 import os.path
+import sys
 
 ROS_TO_EMBEDDED_TYPES = {
     'bool'    :   ('bool',              1, PrimitiveDataType, []),
diff --git a/rosserial_windows/src/rosserial_windows/make_libraries.py b/rosserial_windows/src/rosserial_windows/make_libraries.py
index 5e73ce2d2..ba8a2703b 100755
--- a/rosserial_windows/src/rosserial_windows/make_libraries.py
+++ b/rosserial_windows/src/rosserial_windows/make_libraries.py
@@ -49,6 +49,7 @@
 # for copying files
 import shutil
 import os.path
+import sys
 
 ROS_TO_EMBEDDED_TYPES = {
     'bool'    :   ('bool',              1, PrimitiveDataType, []),
diff --git a/rosserial_xbee/scripts/xbee_network.py b/rosserial_xbee/scripts/xbee_network.py
index 7ee715f02..0b7dfef3f 100755
--- a/rosserial_xbee/scripts/xbee_network.py
+++ b/rosserial_xbee/scripts/xbee_network.py
@@ -47,7 +47,7 @@
 client_ports=  {}
 clients = {}
 
-debug = False;
+debug = False
 
 import threading
 
@@ -90,8 +90,8 @@ def flushInput(self):
 		self.rxdata = ''
 
 	# Returns the number of bytes available to be read
-        def inWaiting(self):
-            return len(self.rxdata)
+	def inWaiting(self):
+		return len(self.rxdata)
 
 if __name__== '__main__':
 	print("RosSerial Xbee Network")