diff --git a/vstgui/lib/ctexteditor.cpp b/vstgui/lib/ctexteditor.cpp
index 5b6db6b50..708684ea9 100644
--- a/vstgui/lib/ctexteditor.cpp
+++ b/vstgui/lib/ctexteditor.cpp
@@ -655,8 +655,8 @@ void TextEditorView::parentSizeChanged ()
 			This->setViewSize (viewSize);
 			if (makeCursorVisible)
 				This->onCursorChanged (-1, This->md.editState.cursor);
-			This->md.editState.row_count_per_page =
-				This->getVisibleViewSize ().getHeight () / This->md.lineHeight;
+			This->md.editState.row_count_per_page = static_cast<int> (
+				std::ceil (This->getVisibleViewSize ().getHeight () / This->md.lineHeight));
 		};
 		auto frame = getFrame ();
 		if (frame && frame->inEventProcessing ())
@@ -1469,7 +1469,7 @@ void TextEditorView::insertNewLine () const
 	auto isWhiteSpace = [] (char16_t character) {
 		return character == u'\t' || character == u' ';
 	};
-	for (auto index = currentLine->range.start; index < cursor; ++index)
+	for (auto index = static_cast<int> (currentLine->range.start); index < cursor; ++index)
 	{
 		if (isWhiteSpace (md.model.text[index]))
 		{
diff --git a/vstgui/lib/enumbitset.h b/vstgui/lib/enumbitset.h
index 832067591..03e0f7b00 100644
--- a/vstgui/lib/enumbitset.h
+++ b/vstgui/lib/enumbitset.h
@@ -127,7 +127,8 @@ struct EnumBitset
 	{
 		if constexpr (EnumIsBitMask)
 			return static_cast<value_type> (e);
-		return 1 << static_cast<value_type> (e);
+		else
+			return 1 << static_cast<value_type> (e);
 	}
 
 	value_type val {};