diff --git a/src/modules/systemlib/mixer/multi_tables b/src/modules/systemlib/mixer/multi_tables
index 786b63b023..2752165cfb 100755
--- a/src/modules/systemlib/mixer/multi_tables
+++ b/src/modules/systemlib/mixer/multi_tables
@@ -1,4 +1,37 @@
 #!/usr/bin/python
+############################################################################
+#
+#   Copyright (c) 2013, 2014 PX4 Development Team. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name PX4 nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
 #
 # Generate multirotor mixer scale tables compatible with the ArduCopter layout
 #
@@ -6,7 +39,7 @@
 import math
 
 print "/*"
-print "* These file is automatically generated by multi_tables.py - do not edit."
+print "* These file is automatically generated by multi_tables - do not edit."
 print "*/"
 print ""
 
diff --git a/src/modules/systemlib/mixer/multi_tables.mk b/src/modules/systemlib/mixer/multi_tables.mk
index 02216c3d44..6429961cc8 100644
--- a/src/modules/systemlib/mixer/multi_tables.mk
+++ b/src/modules/systemlib/mixer/multi_tables.mk
@@ -1,6 +1,6 @@
 ############################################################################
 #
-#   Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved.
+#   Copyright (c) 2014 Anton Matosov <anton.matosov@gmail.com>. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -38,4 +38,6 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 $(SELF_DIR)mixer_multirotor.cpp : $(SELF_DIR)mixer_multirotor.generated.h
 
 $(SELF_DIR)mixer_multirotor.generated.h : $(SELF_DIR)multi_tables
-	$(SELF_DIR)multi_tables> $(SELF_DIR)mixer_multirotor.generated.h
\ No newline at end of file
+	$(SELF_DIR)multi_tables > $(SELF_DIR)mixer_multirotor.generated.h
+	$(SELF_DIR)multi_tables
+	
\ No newline at end of file
diff --git a/unittests/Makefile b/unittests/Makefile
index 719db2ca2e..cb08aa8fcd 100644
--- a/unittests/Makefile
+++ b/unittests/Makefile
@@ -1,7 +1,7 @@
 
 CC=g++
 CFLAGS=-I. -I../src/modules -I ../src/include -I../src/drivers \
-	-I../src -I../src/lib -D__EXPORT="" -Dnullptr="0" -lm -std=gnu++0x
+	-I../src -I../src/lib -D__EXPORT="" -Dnullptr="0" -lm -std=c++0x
 
 # Points to the root of Google Test, relative to where this file is.
 # Remember to tweak this if you move this file.