diff --git a/SConscript b/SConscript
index f01fcda414536aaf0e5c3ad0392cb1ef2cadc52f..fcb438d653bee1cebc23c379ea7fe6fede383779 100644
--- a/SConscript
+++ b/SConscript
@@ -68,8 +68,6 @@ if "CYGWIN" in sysname:
 
 
 Export('env')
-#print 'env='
-#print env.Dump()
 libPEBLISS=SConscript("pebliss/trunk/pe_lib/SConscript", variant_dir='scons_build/libPEBLISS')
 libEXEIO=SConscript("libEXEIO/SConscript", variant_dir='scons_build/libEXEIO')
 libbea=SConscript("beaengine/SConscript", variant_dir='scons_build/beaengine')
diff --git a/libEXEIO/src/SConscript b/libEXEIO/src/SConscript
index edc6d28696c1abb771ea84a320fec0b423edd3e9..64db2b4573b85d2369c20b1a0efa7dcd799e23a7 100644
--- a/libEXEIO/src/SConscript
+++ b/libEXEIO/src/SConscript
@@ -1,7 +1,7 @@
 import os
 
 Import('env')
-myenv=env
+myenv=env.Clone()
 myenv.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
 
 
@@ -18,7 +18,7 @@ cpppath='''
 	'''
 
 #myenv.Append(CCFLAGS="-Wp,-w -Wall")
-myenv.Append(CCFLAGS="-w")
+myenv.Append(CCFLAGS=" -w ")
 
 myenv=myenv.Clone(CPPPATH=Split(cpppath))
 lib=myenv.Library(libname, Split(files))
diff --git a/libEXEIO/test/SConscript b/libEXEIO/test/SConscript
index a8581a4c89caab5fb8228f114fcd27dba4785d04..16d2be4fe44b7b1da904fd10c2dd255531d7131f 100644
--- a/libEXEIO/test/SConscript
+++ b/libEXEIO/test/SConscript
@@ -1,7 +1,7 @@
 import os
 
 Import('env')
-myenv=env
+myenv=env.Clone()
 myenv.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
 
 
@@ -21,7 +21,7 @@ libpath='''
 	'''
 
 #myenv.Append(CCFLAGS="-Wp,-w -Wall")
-myenv.Append(CCFLAGS="-g")
+myenv.Append(CCFLAGS=" -g ")
 
 libs=   '''
 	EXEIO
diff --git a/libIRDB/include/cfg/BasicBlock.hpp b/libIRDB/include/cfg/BasicBlock.hpp
index 0a7b85a5099259d1599b26fe89925ba572322e1e..bd61587db7bc449803d1ec121ec5b6152cb2ef4d 100644
--- a/libIRDB/include/cfg/BasicBlock.hpp
+++ b/libIRDB/include/cfg/BasicBlock.hpp
@@ -19,6 +19,9 @@
  */
 
 
+class BasicBlock_t;
+typedef std::set<BasicBlock_t*> BasicBlockSet_t;
+typedef std::vector<Instruction_t*> InstructionVector_t;
 
 class BasicBlock_t
 {
@@ -29,10 +32,10 @@ class BasicBlock_t
 		bool GetIsExitBlock() { return is_exit_block; }
 		void SetIsExitBlock(bool is_exit) { is_exit_block=is_exit; }
 
-		std::vector<Instruction_t*>& GetInstructions() { return instructions; }
-		std::set<BasicBlock_t*>&     GetPredecessors() { return predecessors; }
-		std::set<BasicBlock_t*>&     GetSuccessors()   { return successors; }
-		std::set<BasicBlock_t*>&     GetIndirectTargets() { return indirect_targets; }
+		InstructionVector_t& GetInstructions() { return instructions; }
+		BasicBlockSet_t&     GetPredecessors() { return predecessors; }
+		BasicBlockSet_t&     GetSuccessors()   { return successors; }
+		BasicBlockSet_t&     GetIndirectTargets() { return indirect_targets; }
 
 		BasicBlock_t* GetFallthrough();
 		BasicBlock_t* GetTarget();
@@ -49,10 +52,10 @@ class BasicBlock_t
 
 	private:
 
-		std::vector<Instruction_t*> instructions;
-		std::set<BasicBlock_t*> predecessors;
-		std::set<BasicBlock_t*> successors;
-		std::set<BasicBlock_t*> indirect_targets;
+		InstructionVector_t instructions;
+		BasicBlockSet_t  predecessors;
+		BasicBlockSet_t  successors;
+		BasicBlockSet_t  indirect_targets;
 		bool is_exit_block;
 
 	friend std::ostream& operator<<(std::ostream& os, const BasicBlock_t& block);
diff --git a/libIRDB/include/cfg/CFG.hpp b/libIRDB/include/cfg/CFG.hpp
index ee2c6a13090493b0db8538146776f522362219be..afb0e63bb57b1a98487e3ac2c41bf0c89d23596d 100644
--- a/libIRDB/include/cfg/CFG.hpp
+++ b/libIRDB/include/cfg/CFG.hpp
@@ -20,6 +20,8 @@
 
 
 
+typedef std::set<BasicBlock_t*> BasicBlockSet_t;
+
 class ControlFlowGraph_t
 {
 	public:
@@ -39,7 +41,7 @@ class ControlFlowGraph_t
 	/* friends */
 	public:
 		friend std::ostream& operator<<(std::ostream& os, const ControlFlowGraph_t& cfg);
-		std::set<BasicBlock_t*>&     GetBlocks()   { return blocks; }
+		BasicBlockSet_t& GetBlocks()   { return blocks; }
 };