diff --git a/libsolidity/Compiler.cpp b/libsolidity/Compiler.cpp
index 241cf0402..5eeb0c3e2 100644
--- a/libsolidity/Compiler.cpp
+++ b/libsolidity/Compiler.cpp
@@ -375,7 +375,7 @@ bool Compiler::visit(FunctionDefinition const& _function)
 	for (VariableDeclaration const* localVariable: _function.getLocalVariables())
 		m_context.removeVariable(*localVariable);
 
-	m_context.adjustStackOffset(-c_returnValuesSize);
+	m_context.adjustStackOffset(-(int)c_returnValuesSize);
 	if (!_function.isConstructor())
 		m_context << eth::Instruction::JUMP;
 	return false;
diff --git a/libsolidity/CompilerContext.cpp b/libsolidity/CompilerContext.cpp
index 61c25052c..ee8d3e00c 100644
--- a/libsolidity/CompilerContext.cpp
+++ b/libsolidity/CompilerContext.cpp
@@ -63,7 +63,7 @@ void CompilerContext::addVariable(VariableDeclaration const& _declaration,
 
 void CompilerContext::removeVariable(VariableDeclaration const& _declaration)
 {
-	solAssert(m_localVariables.count(&_declaration), "");
+	solAssert(!!m_localVariables.count(&_declaration), "");
 	m_localVariables.erase(&_declaration);
 }