diff --git a/.gitignore b/.gitignore
index 0688ae576a8209dbbbbc9131d856d14afc88a3d3..22fdae149470a0d2fd45e0a84c8d67bfd5763a6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,7 @@ tools/meds2pdb/meds2pdb
 plugins_install/*.exe
 plugins_install/*.so
 *.swp
+*.os
+*.o
+
+scons_build
diff --git a/SConscript b/SConscript
index 324fbb1d41e23764f7ed83c9cb8b22fc9cf6a053..3163a4a81fbcf76e513ee4b6c09a85b39e70243c 100644
--- a/SConscript
+++ b/SConscript
@@ -96,9 +96,6 @@ dump_map=SConscript("dump_map/SConscript", variant_dir='scons_build/dump_map')
 dump_insns=SConscript("dump_insns/SConscript", variant_dir='scons_build/dump_insns')
 ir_builders=SConscript("ir_builders/SConscript", variant_dir='scons_build/ir_builders')
 
-if int(env['build_deep']) == 1:
-	libIRDBdeep=env.SConscript("libIRDB-deep/src/SConscript", variant_dir='scons_build/libIRDB-deep')
-
 
 tools=None
 if 'build_tools' not in env or env['build_tools'] is None or int(env['build_tools']) == 1:
@@ -124,14 +121,13 @@ libs=( libIRDBcore,
 	dump_insns, 
 	ir_builders)
 
-if int(env['build_deep'] == 1):
-	libs=libs+libIRDBdeep
-
 if "PEDI_HOME" in os.environ:
 	Depends(pedi,  libs)
 	Default( pedi )
+	Return('pedi')
 else:
 
 	Default(libIRDBcore, libIRDBcfg, libIRDButil, libIRDBdeep, libIRDBcore, libehp,libtransform,libEXEIO,libMEDSannotation,libStructDiv,libElfDep, libcapstone, thanos, rida, meds2pdb, dump_map, dump_insns, ir_builders)
 	if 'build_tools' not in env or env['build_tools'] is None or int(env['build_tools']) == 1:
 		Default(tools)
+
diff --git a/SConscript.deep b/SConscript.deep
new file mode 100644
index 0000000000000000000000000000000000000000..93a9b58dfe7cccc9438a77ce455f05072efb0fd2
--- /dev/null
+++ b/SConscript.deep
@@ -0,0 +1,16 @@
+import os
+
+Import('env')
+
+pedi = Command( target = "./testoutput",
+		source = "./SConscript",
+		action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
+
+env['BASE_IRDB_LIBS']="irdb-core", "pqxx", "pq"
+
+libIRDBdeep=env.SConscript("libIRDB-deep/src/SConscript", variant_dir='scons_build/libIRDB-deep')
+
+Depends(pedi,  libIRDBdeep)
+Default( pedi )
+
+Return('pedi')
diff --git a/SConstruct b/SConstruct
index 1232a0c1dbbe170548c352eda055cb70b393718b..870baa527ce66caecdc36b2238b51008d243520b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -70,5 +70,8 @@ if sysname == "SunOS":
 
 
 Export('env')
-SConscript("SConscript", variant_dir='build')
+if int(env['build_deep']) == 1:
+	SConscript("SConscript.deep", variant_dir='build')
+else:
+	SConscript("SConscript", variant_dir='build')
 
diff --git a/libIRDB-deep/src/SConscript b/libIRDB-deep/src/SConscript
index 5b4788ef9245b5a89fd94091d88f01cf588225f3..15daf24c7d1de0049565d3abc0aab12761ac50da 100644
--- a/libIRDB-deep/src/SConscript
+++ b/libIRDB-deep/src/SConscript
@@ -11,6 +11,7 @@ files=  '''
 cpppath=''' 
 	$IRDB_SDK/include/
 	$SECURITY_TRANSFORMS_HOME/include/
+	$SECURITY_TRANSFORMS_HOME/libIRDB-deep/src
 	$SECURITY_TRANSFORMS_HOME/libMEDSannotation/include
 	$SMPSA_HOME/include/
 	'''
diff --git a/libIRDB-deep/src/deep.cpp b/libIRDB-deep/src/deep.cpp
index f58324ad4dd92e17731f67731b36c0e1ba624d64..1ab77bc43feb4763f7a5b09f906af7f3d2b1ebbd 100644
--- a/libIRDB-deep/src/deep.cpp
+++ b/libIRDB-deep/src/deep.cpp
@@ -2,7 +2,7 @@
 #include <map>
 #include <set>
 #include <memory>
-#include "deep.hpp"
+#include <deep.hpp>
 #include <MEDS_DeadRegAnnotation.hpp>
 #include <MEDS_MemoryRangeAnnotation.hpp>
 #include <MEDS_SafeFuncAnnotation.hpp>
diff --git a/libStructDiv/include/structured_diversity.h b/libStructDiv/include/structured_diversity.h
index 3178f51588a3ab29cd80b2bdfa12f4bbb141019e..a6eddd8e7c5b86e804d0fff4de6ba0153e973403 100644
--- a/libStructDiv/include/structured_diversity.h
+++ b/libStructDiv/include/structured_diversity.h
@@ -43,7 +43,7 @@ class StructuredDiversity_t
         		// pass marshalled value to DoBarrier
         		const vector<string> &string_res=DoBarrier(s.str());
 		
-        		assert(string_res.size()==m_total_variants);
+        		assert((size_t)string_res.size()==(size_t)m_total_variants);
 		
         		/* declare a result */
         		vector<T> t_res;
diff --git a/pebliss/trunk/pe_lib/SConscript b/pebliss/trunk/pe_lib/SConscript
index 6e58fd457d33b83d2ba007cb49085106469b062f..e5270eac2201cf4659e32e3f137e403b1187e567 100644
--- a/pebliss/trunk/pe_lib/SConscript
+++ b/pebliss/trunk/pe_lib/SConscript
@@ -47,7 +47,7 @@ files=  '''
 	'''
 
 cpppath=''' 
-	.
+	$SECURITY_TRANSFORMS_HOME/pebliss/trunk/pe_lib
 	'''
 
 myenv=myenv.Clone(CPPPATH=Split(cpppath))