diff --git a/evmjit/CMakeLists.txt b/evmjit/CMakeLists.txt
index ce05c422d..8f3a170d6 100644
--- a/evmjit/CMakeLists.txt
+++ b/evmjit/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_AUTOMOC OFF)
 
 if(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
 else()
-	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra")
+	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wconversion")
 endif()
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/evmjit/libevmjit/Arith256.cpp b/evmjit/libevmjit/Arith256.cpp
index 8e1ceb748..ddf06b463 100644
--- a/evmjit/libevmjit/Arith256.cpp
+++ b/evmjit/libevmjit/Arith256.cpp
@@ -1,13 +1,14 @@
 #include "Arith256.h"
-#include "Type.h"
-#include "Endianness.h"
+
+#include <iostream>
+#include <iomanip>
 
 #include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/IntrinsicInst.h>
 #include "preprocessor/llvm_includes_end.h"
 
-#include <iostream>
-#include <iomanip>
+#include "Type.h"
+#include "Endianness.h"
 
 namespace dev
 {
diff --git a/evmjit/libevmjit/Arith256.h b/evmjit/libevmjit/Arith256.h
index 4b94652d8..2513ca568 100644
--- a/evmjit/libevmjit/Arith256.h
+++ b/evmjit/libevmjit/Arith256.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include "CompilerHelper.h"
 
 namespace dev
diff --git a/evmjit/libevmjit/BasicBlock.cpp b/evmjit/libevmjit/BasicBlock.cpp
index 112e9d652..c9e71be9a 100644
--- a/evmjit/libevmjit/BasicBlock.cpp
+++ b/evmjit/libevmjit/BasicBlock.cpp
@@ -1,5 +1,6 @@
 #include "BasicBlock.h"
-#include "Type.h"
+
+#include <iostream>
 
 #include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/CFG.h>
@@ -9,7 +10,7 @@
 #include <llvm/Support/raw_os_ostream.h>
 #include "preprocessor/llvm_includes_end.h"
 
-#include <iostream>
+#include "Type.h"
 
 namespace dev
 {
diff --git a/evmjit/libevmjit/BasicBlock.h b/evmjit/libevmjit/BasicBlock.h
index 0f639602a..7469b7b69 100644
--- a/evmjit/libevmjit/BasicBlock.h
+++ b/evmjit/libevmjit/BasicBlock.h
@@ -1,7 +1,9 @@
 #pragma once
+
+#include <vector>
+
 #include "Common.h"
 #include "Stack.h"
-#include <vector>
 
 namespace dev
 {
diff --git a/evmjit/libevmjit/Cache.cpp b/evmjit/libevmjit/Cache.cpp
index 64015a820..fe226eefb 100644
--- a/evmjit/libevmjit/Cache.cpp
+++ b/evmjit/libevmjit/Cache.cpp
@@ -1,5 +1,7 @@
 #include "Cache.h"
-#include "ExecutionEngine.h"
+
+#include <iostream>
+#include <cassert>
 
 #include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/Module.h>
@@ -10,8 +12,8 @@
 #include <llvm/Support/raw_os_ostream.h>
 #include "preprocessor/llvm_includes_end.h"
 
-#include <cassert>
-#include <iostream>
+#include "ExecutionEngine.h"
+#include "Utils.h"
 
 namespace dev
 {
@@ -42,7 +44,9 @@ std::unique_ptr<llvm::Module> Cache::getObject(std::string const& id)
 		g_listener->stateChanged(ExecState::CacheLoad);
 
 	CACHE_LOG << id << ": search\n";
-	assert(!g_lastObject);
+	if (!CHECK(!g_lastObject))
+		g_lastObject = nullptr;
+
 	llvm::SmallString<256> cachePath;
 	llvm::sys::path::system_temp_directory(false, cachePath);
 	llvm::sys::path::append(cachePath, "evm_objs", id);
diff --git a/evmjit/libevmjit/Cache.h b/evmjit/libevmjit/Cache.h
index 18f9237f1..e8f01d38d 100644
--- a/evmjit/libevmjit/Cache.h
+++ b/evmjit/libevmjit/Cache.h
@@ -1,7 +1,9 @@
 #pragma once
-#include <llvm/ExecutionEngine/ObjectCache.h>
+
 #include <memory>
 
+#include <llvm/ExecutionEngine/ObjectCache.h>
+
 namespace dev
 {
 namespace eth
diff --git a/evmjit/libevmjit/Common.h b/evmjit/libevmjit/Common.h
index cd7177e67..62731292f 100644
--- a/evmjit/libevmjit/Common.h
+++ b/evmjit/libevmjit/Common.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <vector>
 #include <tuple>
 #include <cstdint>
diff --git a/evmjit/libevmjit/Compiler.cpp b/evmjit/libevmjit/Compiler.cpp
index 91831e966..de48e8ef9 100644
--- a/evmjit/libevmjit/Compiler.cpp
+++ b/evmjit/libevmjit/Compiler.cpp
@@ -1,14 +1,9 @@
 #include "Compiler.h"
-#include "Instruction.h"
-#include "Type.h"
-#include "Memory.h"
-#include "Stack.h"
-#include "Ext.h"
-#include "GasMeter.h"
-#include "Utils.h"
-#include "Endianness.h"
-#include "Arith256.h"
-#include "RuntimeManager.h"
+
+#include <functional>
+#include <fstream>
+#include <chrono>
+#include <sstream>
 
 #include "preprocessor/llvm_includes_start.h"
 #include <llvm/ADT/PostOrderIterator.h>
@@ -20,10 +15,16 @@
 #include <llvm/Transforms/Scalar.h>
 #include "preprocessor/llvm_includes_end.h"
 
-#include <functional>
-#include <fstream>
-#include <chrono>
-#include <sstream>
+#include "Instruction.h"
+#include "Type.h"
+#include "Memory.h"
+#include "Stack.h"
+#include "Ext.h"
+#include "GasMeter.h"
+#include "Utils.h"
+#include "Endianness.h"
+#include "Arith256.h"
+#include "RuntimeManager.h"
 
 namespace dev
 {
diff --git a/evmjit/libevmjit/Compiler.h b/evmjit/libevmjit/Compiler.h
index 30130798c..c9795fb99 100644
--- a/evmjit/libevmjit/Compiler.h
+++ b/evmjit/libevmjit/Compiler.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include "Common.h"
 #include "BasicBlock.h"
 
diff --git a/evmjit/libevmjit/CompilerHelper.cpp b/evmjit/libevmjit/CompilerHelper.cpp
index bf2929429..5c8ee8574 100644
--- a/evmjit/libevmjit/CompilerHelper.cpp
+++ b/evmjit/libevmjit/CompilerHelper.cpp
@@ -1,47 +1,51 @@
-#include "CompilerHelper.h"
-#include "RuntimeManager.h"
-#include <llvm/IR/Module.h>
-
-namespace dev
-{
-namespace eth
-{
-namespace jit
-{
-
-CompilerHelper::CompilerHelper(llvm::IRBuilder<>& _builder) :
-	m_builder(_builder)
-{}
-
-llvm::Module* CompilerHelper::getModule()
-{
-	assert(m_builder.GetInsertBlock());
-	assert(m_builder.GetInsertBlock()->getParent()); // BB must be in a function
-	return m_builder.GetInsertBlock()->getParent()->getParent();
-}
-
-llvm::Function* CompilerHelper::getMainFunction()
-{
-	// TODO: Rename or change semantics of getMainFunction() function
-	assert(m_builder.GetInsertBlock());
-	auto mainFunc = m_builder.GetInsertBlock()->getParent();
-	assert(mainFunc);
-	if (mainFunc == &mainFunc->getParent()->getFunctionList().front())  // Main function is the first one in module
-		return mainFunc;
-	return nullptr;
-}
-
-llvm::CallInst* CompilerHelper::createCall(llvm::Function* _func, std::initializer_list<llvm::Value*> const& _args)
-{
-	return getBuilder().CreateCall(_func, {_args.begin(), _args.size()});
-}
-
-
-RuntimeHelper::RuntimeHelper(RuntimeManager& _runtimeManager):
-	CompilerHelper(_runtimeManager.getBuilder()),
-	m_runtimeManager(_runtimeManager)
-{}
-
-}
-}
-}
+#include "CompilerHelper.h"
+
+#include "preprocessor/llvm_includes_start.h"
+#include <llvm/IR/Module.h>
+#include "preprocessor/llvm_includes_end.h"
+
+#include "RuntimeManager.h"
+
+namespace dev
+{
+namespace eth
+{
+namespace jit
+{
+
+CompilerHelper::CompilerHelper(llvm::IRBuilder<>& _builder) :
+	m_builder(_builder)
+{}
+
+llvm::Module* CompilerHelper::getModule()
+{
+	assert(m_builder.GetInsertBlock());
+	assert(m_builder.GetInsertBlock()->getParent()); // BB must be in a function
+	return m_builder.GetInsertBlock()->getParent()->getParent();
+}
+
+llvm::Function* CompilerHelper::getMainFunction()
+{
+	// TODO: Rename or change semantics of getMainFunction() function
+	assert(m_builder.GetInsertBlock());
+	auto mainFunc = m_builder.GetInsertBlock()->getParent();
+	assert(mainFunc);
+	if (mainFunc == &mainFunc->getParent()->getFunctionList().front())  // Main function is the first one in module
+		return mainFunc;
+	return nullptr;
+}
+
+llvm::CallInst* CompilerHelper::createCall(llvm::Function* _func, std::initializer_list<llvm::Value*> const& _args)
+{
+	return getBuilder().CreateCall(_func, {_args.begin(), _args.size()});
+}
+
+
+RuntimeHelper::RuntimeHelper(RuntimeManager& _runtimeManager):
+	CompilerHelper(_runtimeManager.getBuilder()),
+	m_runtimeManager(_runtimeManager)
+{}
+
+}
+}
+}
diff --git a/evmjit/libevmjit/CompilerHelper.h b/evmjit/libevmjit/CompilerHelper.h
index 912f7e93f..cd6d09a58 100644
--- a/evmjit/libevmjit/CompilerHelper.h
+++ b/evmjit/libevmjit/CompilerHelper.h
@@ -1,79 +1,79 @@
-#pragma once
+#pragma once
 
-#include "preprocessor/llvm_includes_start.h"
+#include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/IRBuilder.h>
-#include "preprocessor/llvm_includes_end.h"
-
-
-namespace dev
-{
-namespace eth
-{
-namespace jit
-{
-class RuntimeManager;
-
-/// Base class for compiler helpers like Memory, GasMeter, etc.
-class CompilerHelper
-{
-protected:
-	CompilerHelper(llvm::IRBuilder<>& _builder);
-
-	CompilerHelper(const CompilerHelper&) = delete;
-	CompilerHelper& operator=(CompilerHelper) = delete;
-
-	/// Reference to the IR module being compiled
-	llvm::Module* getModule();
-
-	/// Reference to the main module function
-	llvm::Function* getMainFunction();
-
-	/// Reference to parent compiler IR builder
-	llvm::IRBuilder<>& m_builder;
-	llvm::IRBuilder<>& getBuilder() { return m_builder; }
-
-	llvm::CallInst* createCall(llvm::Function* _func, std::initializer_list<llvm::Value*> const& _args);
-
-	friend class RuntimeHelper;
-};
-
-
-/// Compiler helper that depends on runtime data
-class RuntimeHelper : public CompilerHelper
-{
-protected:
-	RuntimeHelper(RuntimeManager& _runtimeManager);
-
-	RuntimeManager& getRuntimeManager() { return m_runtimeManager; }
-
-private:
-	RuntimeManager& m_runtimeManager;
-};
-
-
-/// Saves the insert point of the IR builder and restores it when destructed
-struct InsertPointGuard
-{
-	InsertPointGuard(llvm::IRBuilder<>& _builder) :
-		m_builder(_builder),
-		m_insertBB(m_builder.GetInsertBlock()),
-		m_insertPt(m_builder.GetInsertPoint())
-	{}
-
-	InsertPointGuard(const InsertPointGuard&) = delete;
-	void operator=(InsertPointGuard) = delete;
-
-	~InsertPointGuard()
-	{
-		m_builder.SetInsertPoint(m_insertBB, m_insertPt);
-	}
-
-private:
-	llvm::IRBuilder<>& m_builder;
-	llvm::BasicBlock* m_insertBB;
-	llvm::BasicBlock::iterator m_insertPt;
-};
-
-}
-}
-}
+#include "preprocessor/llvm_includes_end.h"
+
+
+namespace dev
+{
+namespace eth
+{
+namespace jit
+{
+class RuntimeManager;
+
+/// Base class for compiler helpers like Memory, GasMeter, etc.
+class CompilerHelper
+{
+protected:
+	CompilerHelper(llvm::IRBuilder<>& _builder);
+
+	CompilerHelper(const CompilerHelper&) = delete;
+	CompilerHelper& operator=(CompilerHelper) = delete;
+
+	/// Reference to the IR module being compiled
+	llvm::Module* getModule();
+
+	/// Reference to the main module function
+	llvm::Function* getMainFunction();
+
+	/// Reference to parent compiler IR builder
+	llvm::IRBuilder<>& m_builder;
+	llvm::IRBuilder<>& getBuilder() { return m_builder; }
+
+	llvm::CallInst* createCall(llvm::Function* _func, std::initializer_list<llvm::Value*> const& _args);
+
+	friend class RuntimeHelper;
+};
+
+
+/// Compiler helper that depends on runtime data
+class RuntimeHelper : public CompilerHelper
+{
+protected:
+	RuntimeHelper(RuntimeManager& _runtimeManager);
+
+	RuntimeManager& getRuntimeManager() { return m_runtimeManager; }
+
+private:
+	RuntimeManager& m_runtimeManager;
+};
+
+
+/// Saves the insert point of the IR builder and restores it when destructed
+struct InsertPointGuard
+{
+	InsertPointGuard(llvm::IRBuilder<>& _builder) :
+		m_builder(_builder),
+		m_insertBB(m_builder.GetInsertBlock()),
+		m_insertPt(m_builder.GetInsertPoint())
+	{}
+
+	InsertPointGuard(const InsertPointGuard&) = delete;
+	void operator=(InsertPointGuard) = delete;
+
+	~InsertPointGuard()
+	{
+		m_builder.SetInsertPoint(m_insertBB, m_insertPt);
+	}
+
+private:
+	llvm::IRBuilder<>& m_builder;
+	llvm::BasicBlock* m_insertBB;
+	llvm::BasicBlock::iterator m_insertPt;
+};
+
+}
+}
+}
diff --git a/evmjit/libevmjit/Endianness.cpp b/evmjit/libevmjit/Endianness.cpp
index f3ee4c783..38f71560c 100644
--- a/evmjit/libevmjit/Endianness.cpp
+++ b/evmjit/libevmjit/Endianness.cpp
@@ -1,38 +1,39 @@
-#include "Endianness.h"
-#include "Type.h"
-
-#include "preprocessor/llvm_includes_start.h"
-#include <llvm/IR/IntrinsicInst.h>
-#include "preprocessor/llvm_includes_end.h"
-
-namespace dev
-{
-namespace eth
-{
-namespace jit
-{
-
-llvm::Value* Endianness::bswapIfLE(llvm::IRBuilder<>& _builder, llvm::Value* _word)
-{
-	union tester
-	{
-		unsigned int  x;
-		unsigned char isLE;
-	};
-
-	if (tester{1}.isLE)
-	{
-		// FIXME: Disabled because of problems with BYTE
-		//if (auto constant = llvm::dyn_cast<llvm::ConstantInt>(_word))
-		//	return _builder.getInt(constant->getValue().byteSwap());
-
-		// OPT: Cache func declaration?
-		auto bswapFunc = llvm::Intrinsic::getDeclaration(_builder.GetInsertBlock()->getParent()->getParent(), llvm::Intrinsic::bswap, Type::Word);
-		return _builder.CreateCall(bswapFunc, _word);
-	}
-	return _word;
-}
-
-}
-}
-}
+#include "Endianness.h"
+
+#include "preprocessor/llvm_includes_start.h"
+#include <llvm/IR/IntrinsicInst.h>
+#include "preprocessor/llvm_includes_end.h"
+
+#include "Type.h"
+
+namespace dev
+{
+namespace eth
+{
+namespace jit
+{
+
+llvm::Value* Endianness::bswapIfLE(llvm::IRBuilder<>& _builder, llvm::Value* _word)
+{
+	union tester
+	{
+		unsigned int  x;
+		unsigned char isLE;
+	};
+
+	if (tester{1}.isLE)
+	{
+		// FIXME: Disabled because of problems with BYTE
+		//if (auto constant = llvm::dyn_cast<llvm::ConstantInt>(_word))
+		//	return _builder.getInt(constant->getValue().byteSwap());
+
+		// OPT: Cache func declaration?
+		auto bswapFunc = llvm::Intrinsic::getDeclaration(_builder.GetInsertBlock()->getParent()->getParent(), llvm::Intrinsic::bswap, Type::Word);
+		return _builder.CreateCall(bswapFunc, _word);
+	}
+	return _word;
+}
+
+}
+}
+}
diff --git a/evmjit/libevmjit/Endianness.h b/evmjit/libevmjit/Endianness.h
index 73224fb21..19fd8fc58 100644
--- a/evmjit/libevmjit/Endianness.h
+++ b/evmjit/libevmjit/Endianness.h
@@ -1,25 +1,25 @@
-#pragma once
-
-#include "preprocessor/llvm_includes_start.h"
-#include <llvm/IR/IRBuilder.h>
-#include "preprocessor/llvm_includes_end.h"
-
-namespace dev
-{
-namespace eth
-{
-namespace jit
-{
-
-struct Endianness
-{
-	static llvm::Value* toBE(llvm::IRBuilder<>& _builder, llvm::Value* _word) { return bswapIfLE(_builder, _word); }
-	static llvm::Value* toNative(llvm::IRBuilder<>& _builder, llvm::Value* _word) { return bswapIfLE(_builder, _word); }
-
-private:
-	static llvm::Value* bswapIfLE(llvm::IRBuilder<>& _builder, llvm::Value* _word);
-};
-
-}
-}
-}
+#pragma once
+
+#include "preprocessor/llvm_includes_start.h"
+#include <llvm/IR/IRBuilder.h>
+#include "preprocessor/llvm_includes_end.h"
+
+namespace dev
+{
+namespace eth
+{
+namespace jit
+{
+
+struct Endianness
+{
+	static llvm::Value* toBE(llvm::IRBuilder<>& _builder, llvm::Value* _word) { return bswapIfLE(_builder, _word); }
+	static llvm::Value* toNative(llvm::IRBuilder<>& _builder, llvm::Value* _word) { return bswapIfLE(_builder, _word); }
+
+private:
+	static llvm::Value* bswapIfLE(llvm::IRBuilder<>& _builder, llvm::Value* _word);
+};
+
+}
+}
+}
diff --git a/evmjit/libevmjit/ExecStats.cpp b/evmjit/libevmjit/ExecStats.cpp
index 97a3445b8..d8668f636 100644
--- a/evmjit/libevmjit/ExecStats.cpp
+++ b/evmjit/libevmjit/ExecStats.cpp
@@ -1,4 +1,5 @@
 #include "ExecStats.h"
+
 #include <iostream>
 #include <iomanip>
 #include <cassert>
diff --git a/evmjit/libevmjit/ExecStats.h b/evmjit/libevmjit/ExecStats.h
index 17f58ccac..498e21341 100644
--- a/evmjit/libevmjit/ExecStats.h
+++ b/evmjit/libevmjit/ExecStats.h
@@ -1,7 +1,9 @@
 #pragma once
-#include "ExecutionEngine.h"
+
 #include <chrono>
 
+#include "ExecutionEngine.h"
+
 namespace dev
 {
 namespace eth
diff --git a/evmjit/libevmjit/ExecutionEngine.cpp b/evmjit/libevmjit/ExecutionEngine.cpp
index c4c03233c..1d2ff91b1 100644
--- a/evmjit/libevmjit/ExecutionEngine.cpp
+++ b/evmjit/libevmjit/ExecutionEngine.cpp
@@ -1,9 +1,8 @@
 #include "ExecutionEngine.h"
-#include "Runtime.h"
-#include "Compiler.h"
-#include "Cache.h"
-#include "ExecStats.h"
-#include "BuildInfo.gen.h"
+
+#include <array>
+#include <cstdlib>	// env options
+#include <iostream>
 
 #include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/Module.h>
@@ -15,9 +14,12 @@
 #include <llvm/Support/Host.h>
 #include "preprocessor/llvm_includes_end.h"
 
-#include <array>
-#include <cstdlib>	// env options
-#include <iostream>
+#include "Runtime.h"
+#include "Compiler.h"
+#include "Cache.h"
+#include "ExecStats.h"
+#include "Utils.h"
+#include "BuildInfo.gen.h"
 
 namespace dev
 {
@@ -97,7 +99,7 @@ ReturnCode ExecutionEngine::run(RuntimeData* _data, Env* _env)
 		module->setTargetTriple(triple.str());
 
 		ee.reset(builder.create());
-		if (!ee)
+		if (!CHECK(ee))
 			return ReturnCode::LLVMConfigError;
 		module.release();  // Successfully created llvm::ExecutionEngine takes ownership of the module
 		ee->setObjectCache(objectCache);
@@ -110,7 +112,7 @@ ReturnCode ExecutionEngine::run(RuntimeData* _data, Env* _env)
 
 	auto entryFuncPtr = (EntryFuncPtr)ee->getFunctionAddress(mainFuncName);
 	if (!entryFuncPtr)
-	{		
+	{
 		auto module = objectCache ? Cache::getObject(mainFuncName) : nullptr;
 		if (!module)
 		{
@@ -126,7 +128,8 @@ ReturnCode ExecutionEngine::run(RuntimeData* _data, Env* _env)
 		listener->stateChanged(ExecState::CodeGen);
 		entryFuncPtr = (EntryFuncPtr)ee->getFunctionAddress(mainFuncName);
 	}
-	assert(entryFuncPtr); //TODO: Replace it with safe exception
+	if (!CHECK(entryFuncPtr))
+		return ReturnCode::LLVMLinkError;
 
 	listener->stateChanged(ExecState::Execution);
 	auto returnCode = entryFuncPtr(&runtime);
diff --git a/evmjit/libevmjit/ExecutionEngine.h b/evmjit/libevmjit/ExecutionEngine.h
index a31b6bf1e..4c2965e58 100644
--- a/evmjit/libevmjit/ExecutionEngine.h
+++ b/evmjit/libevmjit/ExecutionEngine.h
@@ -1,7 +1,9 @@
 #pragma once
-#include "RuntimeData.h"
+
 #include <memory>
 
+#include "RuntimeData.h"
+
 namespace dev
 {
 namespace eth
diff --git a/evmjit/libevmjit/Ext.cpp b/evmjit/libevmjit/Ext.cpp
index c06d01f74..38deef214 100644
--- a/evmjit/libevmjit/Ext.cpp
+++ b/evmjit/libevmjit/Ext.cpp
@@ -1,13 +1,14 @@
 #include "Ext.h"
+
+#include "preprocessor/llvm_includes_start.h"
+#include <llvm/IR/IntrinsicInst.h>
+#include "preprocessor/llvm_includes_end.h"
+
 #include "RuntimeManager.h"
 #include "Memory.h"
 #include "Type.h"
 #include "Endianness.h"
 
-#include "preprocessor/llvm_includes_start.h"
-#include <llvm/IR/IntrinsicInst.h>
-#include "preprocessor/llvm_includes_end.h"
-
 namespace dev
 {
 namespace eth
diff --git a/evmjit/libevmjit/Ext.h b/evmjit/libevmjit/Ext.h
index 669797848..1c0c0fc56 100644
--- a/evmjit/libevmjit/Ext.h
+++ b/evmjit/libevmjit/Ext.h
@@ -1,7 +1,9 @@
 #pragma once
-#include "CompilerHelper.h"
+
 #include <array>
 
+#include "CompilerHelper.h"
+
 namespace dev
 {
 namespace eth
diff --git a/evmjit/libevmjit/GasMeter.cpp b/evmjit/libevmjit/GasMeter.cpp
index 9f73df7da..ca21714e0 100644
--- a/evmjit/libevmjit/GasMeter.cpp
+++ b/evmjit/libevmjit/GasMeter.cpp
@@ -1,11 +1,11 @@
 #include "GasMeter.h"
-#include "Ext.h"
-#include "RuntimeManager.h"
 
-#include "preprocessor/llvm_includes_start.h"
-#include <llvm/IR/IntrinsicInst.h>
+#include "preprocessor/llvm_includes_start.h"
+#include <llvm/IR/IntrinsicInst.h>
 #include "preprocessor/llvm_includes_end.h"
 
+#include "Ext.h"
+#include "RuntimeManager.h"
 
 namespace dev
 {
diff --git a/evmjit/libevmjit/GasMeter.h b/evmjit/libevmjit/GasMeter.h
index 4f29f5c29..4056cd64d 100644
--- a/evmjit/libevmjit/GasMeter.h
+++ b/evmjit/libevmjit/GasMeter.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include "CompilerHelper.h"
 #include "Instruction.h"
 
diff --git a/evmjit/libevmjit/Instruction.h b/evmjit/libevmjit/Instruction.h
index db18c934a..6785213d6 100644
--- a/evmjit/libevmjit/Instruction.h
+++ b/evmjit/libevmjit/Instruction.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include "Common.h"
 
 namespace llvm
diff --git a/evmjit/libevmjit/Memory.cpp b/evmjit/libevmjit/Memory.cpp
index e29bbcaba..647c5f26a 100644
--- a/evmjit/libevmjit/Memory.cpp
+++ b/evmjit/libevmjit/Memory.cpp
@@ -1,14 +1,15 @@
 #include "Memory.h"
+
+#include "preprocessor/llvm_includes_start.h"
+#include <llvm/IR/IntrinsicInst.h>
+#include "preprocessor/llvm_includes_end.h"
+
 #include "Type.h"
 #include "Runtime.h"
 #include "GasMeter.h"
 #include "Endianness.h"
 #include "RuntimeManager.h"
 
-#include "preprocessor/llvm_includes_start.h"
-#include <llvm/IR/IntrinsicInst.h>
-#include "preprocessor/llvm_includes_end.h"
-
 namespace dev
 {
 namespace eth
diff --git a/evmjit/libevmjit/Memory.h b/evmjit/libevmjit/Memory.h
index 90c01c1ca..e8edce735 100644
--- a/evmjit/libevmjit/Memory.h
+++ b/evmjit/libevmjit/Memory.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include "CompilerHelper.h"
 
 namespace dev
diff --git a/evmjit/libevmjit/Runtime.cpp b/evmjit/libevmjit/Runtime.cpp
index b8466791a..69937368c 100644
--- a/evmjit/libevmjit/Runtime.cpp
+++ b/evmjit/libevmjit/Runtime.cpp
@@ -1,4 +1,5 @@
 #include "Runtime.h"
+
 #include <cassert>
 
 namespace dev
diff --git a/evmjit/libevmjit/Runtime.h b/evmjit/libevmjit/Runtime.h
index 9ea3039a0..82be4a0c8 100644
--- a/evmjit/libevmjit/Runtime.h
+++ b/evmjit/libevmjit/Runtime.h
@@ -1,39 +1,40 @@
-#pragma once
-#include "RuntimeData.h"
-
-namespace dev
-{
-namespace eth
-{
-namespace jit
-{
-
-using StackImpl = std::vector<i256>;
-using MemoryImpl = bytes;
-
-class Runtime
-{
-public:
-	Runtime(RuntimeData* _data, Env* _env);
-
-	Runtime(const Runtime&) = delete;
-	Runtime& operator=(const Runtime&) = delete;
-
-	StackImpl& getStack() { return m_stack; }
-	MemoryImpl& getMemory() { return m_memory; }
-
-	bytes_ref getReturnData() const;
-
-private:
-	RuntimeData& m_data;			///< Pointer to data. Expected by compiled contract.
-	Env& m_env;						///< Pointer to environment proxy. Expected by compiled contract.
-	void* m_currJmpBuf = nullptr;	///< Pointer to jump buffer. Expected by compiled contract.
-	byte* m_memoryData = nullptr;
-	i256 m_memorySize;
-	StackImpl m_stack;
-	MemoryImpl m_memory;
-};
-
-}
-}
-}
+#pragma once
+
+#include "RuntimeData.h"
+
+namespace dev
+{
+namespace eth
+{
+namespace jit
+{
+
+using StackImpl = std::vector<i256>;
+using MemoryImpl = bytes;
+
+class Runtime
+{
+public:
+	Runtime(RuntimeData* _data, Env* _env);
+
+	Runtime(const Runtime&) = delete;
+	Runtime& operator=(const Runtime&) = delete;
+
+	StackImpl& getStack() { return m_stack; }
+	MemoryImpl& getMemory() { return m_memory; }
+
+	bytes_ref getReturnData() const;
+
+private:
+	RuntimeData& m_data;			///< Pointer to data. Expected by compiled contract.
+	Env& m_env;						///< Pointer to environment proxy. Expected by compiled contract.
+	void* m_currJmpBuf = nullptr;	///< Pointer to jump buffer. Expected by compiled contract.
+	byte* m_memoryData = nullptr;
+	i256 m_memorySize;
+	StackImpl m_stack;
+	MemoryImpl m_memory;
+};
+
+}
+}
+}
diff --git a/evmjit/libevmjit/RuntimeData.h b/evmjit/libevmjit/RuntimeData.h
index 50522f0bc..cc081cc58 100644
--- a/evmjit/libevmjit/RuntimeData.h
+++ b/evmjit/libevmjit/RuntimeData.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include "Common.h"
 
 namespace dev
diff --git a/evmjit/libevmjit/RuntimeManager.h b/evmjit/libevmjit/RuntimeManager.h
index 2fdad3fb5..30c69ec88 100644
--- a/evmjit/libevmjit/RuntimeManager.h
+++ b/evmjit/libevmjit/RuntimeManager.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include "CompilerHelper.h"
 #include "Type.h"
 #include "RuntimeData.h"
diff --git a/evmjit/libevmjit/Stack.cpp b/evmjit/libevmjit/Stack.cpp
index b63660aa9..81a954991 100644
--- a/evmjit/libevmjit/Stack.cpp
+++ b/evmjit/libevmjit/Stack.cpp
@@ -1,8 +1,11 @@
 #include "Stack.h"
-#include "RuntimeManager.h"
-#include "Runtime.h"
 
+#include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/Function.h>
+#include "preprocessor/llvm_includes_end.h"
+
+#include "RuntimeManager.h"
+#include "Runtime.h"
 
 namespace dev
 {
diff --git a/evmjit/libevmjit/Stack.h b/evmjit/libevmjit/Stack.h
index 0a549597f..4b6fa374f 100644
--- a/evmjit/libevmjit/Stack.h
+++ b/evmjit/libevmjit/Stack.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include "CompilerHelper.h"
 
 namespace dev
diff --git a/evmjit/libevmjit/Type.h b/evmjit/libevmjit/Type.h
index 46fd5c9b7..b8a4a09eb 100644
--- a/evmjit/libevmjit/Type.h
+++ b/evmjit/libevmjit/Type.h
@@ -1,11 +1,12 @@
 #pragma once
-#include "Common.h"
 
 #include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/Type.h>
 #include <llvm/IR/Constants.h>
 #include "preprocessor/llvm_includes_end.h"
 
+#include "Common.h"
+
 namespace dev
 {
 namespace eth
diff --git a/evmjit/libevmjit/Utils.h b/evmjit/libevmjit/Utils.h
index 7e6133ced..aad975f5b 100644
--- a/evmjit/libevmjit/Utils.h
+++ b/evmjit/libevmjit/Utils.h
@@ -16,6 +16,9 @@ struct JIT: public NoteChannel  { static const char* name() { return "JIT"; } };
 //#define clog(CHANNEL) std::cerr
 #define clog(CHANNEL) std::ostream(nullptr)
 
+// The same as assert, but expression is always evaluated and result returned
+#define CHECK(expr) (assert(expr), expr)
+
 }
 }
 }
diff --git a/evmjit/libevmjit/preprocessor/llvm_includes_end.h b/evmjit/libevmjit/preprocessor/llvm_includes_end.h
index 3a47dca15..023c8021e 100644
--- a/evmjit/libevmjit/preprocessor/llvm_includes_end.h
+++ b/evmjit/libevmjit/preprocessor/llvm_includes_end.h
@@ -1,3 +1,5 @@
-
-#pragma warning(pop)
-#pragma GCC diagnostic pop
+#if defined(_MSC_VER)
+	#pragma warning(pop)
+#else
+	#pragma GCC diagnostic pop
+#endif
diff --git a/evmjit/libevmjit/preprocessor/llvm_includes_start.h b/evmjit/libevmjit/preprocessor/llvm_includes_start.h
index 264a6e1ef..bf34ade99 100644
--- a/evmjit/libevmjit/preprocessor/llvm_includes_start.h
+++ b/evmjit/libevmjit/preprocessor/llvm_includes_start.h
@@ -1,5 +1,8 @@
-
-#pragma warning(push)
-#pragma warning(disable: 4267 4244 4800)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
+#if defined(_MSC_VER)
+	#pragma warning(push)
+	#pragma warning(disable: 4267 4244 4800)
+#else
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wunused-parameter"
+	#pragma GCC diagnostic ignored "-Wconversion"
+#endif