diff --git a/libsolidity/AST.h b/libsolidity/AST.h
index 97ff30cf3..754e9254c 100755
--- a/libsolidity/AST.h
+++ b/libsolidity/AST.h
@@ -280,7 +280,8 @@ class FunctionDefinition: public Declaration
 {
 public:
 	FunctionDefinition(Location const& _location, ASTPointer<ASTString> const& _name,
-					bool _isPublic, bool _isConstructor,
+					bool _isPublic,
+					bool _isConstructor,
 					ASTPointer<ASTString> const& _documentation,
 					ASTPointer<ParameterList> const& _parameters,
 					bool _isDeclaredConst,
diff --git a/libsolidity/CallGraph.cpp b/libsolidity/CallGraph.cpp
index 8766114ff..a671796bd 100644
--- a/libsolidity/CallGraph.cpp
+++ b/libsolidity/CallGraph.cpp
@@ -58,7 +58,7 @@ bool CallGraph::visit(Identifier const& _identifier)
 	{
 		if (m_overrideResolver)
 			fun = (*m_overrideResolver)(fun->getName());
-		solAssert(fun, "");
+		solAssert(fun, "Error finding override for function " + fun->getName());
 		addFunction(*fun);
 	}
 	return true;
diff --git a/libsolidity/Parser.cpp b/libsolidity/Parser.cpp
index fb8640720..fcabdb29b 100644
--- a/libsolidity/Parser.cpp
+++ b/libsolidity/Parser.cpp
@@ -112,9 +112,9 @@ ASTPointer<ImportDirective> Parser::parseImportDirective()
 ASTPointer<ContractDefinition> Parser::parseContractDefinition()
 {
 	ASTNodeFactory nodeFactory(*this);
-	ASTPointer<ASTString> docstring;
+	ASTPointer<ASTString> docString;
 	if (m_scanner->getCurrentCommentLiteral() != "")
-		docstring = make_shared<ASTString>(m_scanner->getCurrentCommentLiteral());
+		docString = make_shared<ASTString>(m_scanner->getCurrentCommentLiteral());
 	expectToken(Token::CONTRACT);
 	ASTPointer<ASTString> name = expectIdentifierToken();
 	vector<ASTPointer<InheritanceSpecifier>> baseContracts;
@@ -157,7 +157,7 @@ ASTPointer<ContractDefinition> Parser::parseContractDefinition()
 	}
 	nodeFactory.markEndPosition();
 	expectToken(Token::RBRACE);
-	return nodeFactory.createNode<ContractDefinition>(name, docstring, baseContracts, structs,
+	return nodeFactory.createNode<ContractDefinition>(name, docString, baseContracts, structs,
 													  stateVariables, functions);
 }