diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index e2b4ab7a1..182aafa6b 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -344,7 +344,7 @@ struct FunctionCallAnnotation: ExpressionAnnotation
 };
 
 /// Experimental Solidity annotations.
-/// Used to intergrate with name and type resolution.
+/// Used to integrate with name and type resolution.
 /// @{
 struct TypeClassDefinitionAnnotation: TypeDeclarationAnnotation, StructurallyDocumentedAnnotation
 {
diff --git a/libsolidity/experimental/ast/TypeSystemHelper.cpp b/libsolidity/experimental/ast/TypeSystemHelper.cpp
index e819b84ba..d2280b181 100644
--- a/libsolidity/experimental/ast/TypeSystemHelper.cpp
+++ b/libsolidity/experimental/ast/TypeSystemHelper.cpp
@@ -375,9 +375,9 @@ std::string TypeEnvironmentHelpers::typeToString(Type const& _type) const
 			std::stringstream stream;
 			std::string varName;
 			size_t index = _type.index();
-			varName += 'a' + static_cast<char>(index%26);
+			varName += static_cast<char>('a' + (index%26));
 			while (index /= 26)
-				varName += 'a' + static_cast<char>(index%26);
+				varName += static_cast<char>('a' + (index%26));
 			reverse(varName.begin(), varName.end());
 			stream << '\'' << varName;
 			switch (_type.sort().classes.size())