diff --git a/cpp/.gitignore b/cpp/.gitignore
index 8fded6255..589a7ab72 100644
--- a/cpp/.gitignore
+++ b/cpp/.gitignore
@@ -1,3 +1,4 @@
 /build
 /.sconsign.dblite
 xcuserdata
+callgrind.out.*
\ No newline at end of file
diff --git a/cpp/.valgrindrc b/cpp/.valgrindrc
index 5c54def98..f364c12b9 100644
--- a/cpp/.valgrindrc
+++ b/cpp/.valgrindrc
@@ -1 +1 @@
---memcheck:leak-check=full --suppressions=.valgrind.supp --gen-suppressions=all
\ No newline at end of file
+--memcheck:leak-check=full --memcheck:suppressions=.valgrind.supp --memcheck:gen-suppressions=all
\ No newline at end of file
diff --git a/cpp/SConscript b/cpp/SConscript
index 8e07367ac..6aa57b094 100644
--- a/cpp/SConscript
+++ b/cpp/SConscript
@@ -13,7 +13,7 @@ if debug:
 	#compile_options['CPPDEFINES'] = "-DDEBUG"
 	flags.append("-O0 -g3 -ggdb -Wall")
 else:
-	flags.append("-O -g3 -Wall")
+	flags.append("-Os -g3 -Wall")
 if env['PIC']:
 	flags.append("-fPIC")