diff --git a/SConscript b/SConscript
index 01f052d5e..e48e66dc1 100644
--- a/SConscript
+++ b/SConscript
@@ -30,6 +30,10 @@ env.Append(CPPPATH = [env['TOP'] + '/vrouter/sandesh/gen-c'])
 env.Append(CPPPATH = ['#tools'])
 env.Append(CPPPATH = ['#tools/sandesh/library/c'])
 
+# Make Sandesh quiet for production
+if 'production' in env['OPT']:
+    DefaultEnvironment().Append(CPPDEFINES='SANDESH_QUIET')
+
 vr_root = './'
 makefile = vr_root + 'Makefile'
 dp_dir = Dir(vr_root).srcnode().abspath + '/'
diff --git a/host/SConscript b/host/SConscript
index 1e8eee52e..8a7ec25fa 100644
--- a/host/SConscript
+++ b/host/SConscript
@@ -14,7 +14,7 @@ libvrouter_sources = [
                         'vr_host_packet.c',
                         'vr_host_io.c',
                         'vrouter_host_mod.c',
-						'ulinux.c'
+                        'ulinux.c'
                      ]
 # CFLAGS
 env.Append(CCFLAGS = '-g')