diff --git a/irdb-libs/libIRDB-core/src/decode_csx86.cpp b/irdb-libs/libIRDB-core/src/decode_csx86.cpp
index dc6844c5733f60fbea7841596ea209ba1616f9b7..792b42ae76764feafadab26625e66a1159c78136 100644
--- a/irdb-libs/libIRDB-core/src/decode_csx86.cpp
+++ b/irdb-libs/libIRDB-core/src/decode_csx86.cpp
@@ -574,17 +574,17 @@ uint32_t DecodedInstructionCapstoneX86_t::getPrefixCount() const
 
 IRDB_SDK::VirtualOffset_t DecodedInstructionCapstoneX86_t::getMemoryDisplacementOffset(const IRDB_SDK::DecodedOperand_t* p_t, const IRDB_SDK::Instruction_t* insn) const
 {
-	auto &t = *p_t;
+	const auto &t = *p_t;
 	if(!valid()) throw std::logic_error(string("Called ")+__FUNCTION__+" on invalid instruction");
 
-	const auto the_insn=static_cast<cs_insn*>(my_insn.get());
+	const auto the_insn = static_cast<cs_insn*>(my_insn.get());
 
 	//const auto encoding_size=t.getMemoryDisplacementEncodingSize();
 	//const auto x86 = &(the_insn->detail->x86);
-    const auto imm_count = cs_op_count(cs_handle->getHandle(), the_insn, X86_OP_IMM);
-	const auto disp_size=t.getMemoryDisplacementEncodingSize();
-	const auto imm=getImmediate();
-	const auto disp=t.getMemoryDisplacement();
+	const auto imm_count = cs_op_count(cs_handle->getHandle(), the_insn, X86_OP_IMM);
+	const auto disp_size = t.getMemoryDisplacementEncodingSize();
+	const auto imm       = getImmediate();
+	const auto disp      = t.getMemoryDisplacement();
 
 	if(string((char*)the_insn->detail->x86.opcode)=="\x0f\xc2") // CMPPD, CMPSS 
 	{
@@ -633,8 +633,7 @@ IRDB_SDK::VirtualOffset_t DecodedInstructionCapstoneX86_t::getMemoryDisplacement
 	}
 
 	assert(0);
-
-
+	abort();
 }
 
 
diff --git a/irdb-libs/libMEDSannotation/src/MEDS_Register.cpp b/irdb-libs/libMEDSannotation/src/MEDS_Register.cpp
index 36741f094d56be4bb96f549c7fd16a28eeeb4ef3..fe6ba053c4bd0ffad70d256b594627b60ddcef99 100644
--- a/irdb-libs/libMEDSannotation/src/MEDS_Register.cpp
+++ b/irdb-libs/libMEDSannotation/src/MEDS_Register.cpp
@@ -444,6 +444,7 @@ string Register::readRegisterSet(const string &in, RegisterSet_t &out)
 	}
 
 	assert(0 && "No terminator found for register list");
+	abort();	// needed for avoiding errors
 }
 
 RegisterName Register::promoteTo64(const RegisterName p_reg)