diff --git a/Makefile b/Makefile
index 0257a46..bd0caac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,18 @@
 CC=g++
 CXXFLAGS=-m64 -fno-rtti -fno-rtti -fno-exceptions -fvisibility=hidden -Wall -W -Werror -Woverloaded-virtual -Wnon-virtual-dtor \
-         -Wno-unused-const-variable -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-unused-parameter -Wno-unneeded-internal-declaration -Wno-unused-function
+         -Wno-unused-const-variable -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-unused-parameter \
+         -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-unused-private-field
 CXXFLAGS+=-DV8_TARGET_ARCH_X64 -DOBJECT_PRINT -DENABLE_DISASSEMBLER -DENABLE_DEBUGGER_SUPPORT -DV8_ENABLE_CHECKS -DDEBUG -O3
 CXXFLAGS+=-isystem v8/include -isystem v8/src
-LDFLAGS=-static -Lv8/out/x64.debug/obj.target/tools/gyp -pthread
+LDFLAGS=-Lv8/out/x64.debug/ -pthread
 LDLIBS=-lv8_base -lv8_snapshot -lsqlite3 -ldl
 SRCS=$(wildcard *.cc *.cpp)
 
 jsgram: BuiltIns.o CanonicalAst.o DependenceGraph.o PDGExtractor.o CodePrinter.o StatementCopier.o OperationPrinter.o SequenceExtractor.o
 
-v8: v8/out/x64.debug/obj.target/tools/gyp/libv8_base.so
+v8: v8/out/x64.debug/libv8_base.a
 
-v8/out/x64.debug/obj.target/tools/gyp/libv8_base.so:
+v8/out/x64.debug/libv8_base.a:
 	if [ ! -d depot_tools ]; then git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git; fi
 	if [ ! -d v8 ]; then ./depot_tools/fetch v8; fi
 	cd v8 && git checkout branch-heads/3.15
diff --git a/Utility.h b/Utility.h
index b68e38d..92bb2c8 100644
--- a/Utility.h
+++ b/Utility.h
@@ -20,17 +20,17 @@
 
 #include <functional>
 #include <iterator>
-#include <tr1/functional>
+#include <functional>
 #include <utility>
 
-namespace std { namespace tr1 {
+namespace std { //namespace tr1 {
 
 template<class T>
 struct hash<pair<T,T> > : unary_function<pair<T,T>,size_t> {
     inline size_t operator() (const pair<T,T>& x) const { return hash<T>()(x.first) * 2654435761 + hash<T>()(x.second) * 0x6b43a9b5; }
 };
 
-} }
+} //}
 
 template <class Map>
 struct key_iterator : std::iterator<std::bidirectional_iterator_tag,const typename Map::key_type> {