diff --git a/src/common/QskTextOptions.cpp b/src/common/QskTextOptions.cpp
index 53f64e2f..98e9b3ca 100644
--- a/src/common/QskTextOptions.cpp
+++ b/src/common/QskTextOptions.cpp
@@ -57,8 +57,8 @@ QskTextOptions::TextFormat QskTextOptions::effectiveFormat( const QString& text
 
     if ( m_format == QskTextOptions::AutoText )
         return Qt::mightBeRichText( text ) ? StyledText : PlainText;
-    else
-        return m_format;
+
+    return static_cast< QskTextOptions::TextFormat >( m_format );
 }
 
 QskHashValue QskTextOptions::hash( QskHashValue seed ) const noexcept
diff --git a/src/common/QskTextOptions.h b/src/common/QskTextOptions.h
index cbf16c1a..ff4c0e46 100644
--- a/src/common/QskTextOptions.h
+++ b/src/common/QskTextOptions.h
@@ -119,7 +119,8 @@ constexpr inline Qt::TextElideMode QskTextOptions::elideMode() const noexcept
 
 constexpr inline Qt::TextElideMode QskTextOptions::effectiveElideMode() const noexcept
 {
-    return ( wrapMode() != QskTextOptions::NoWrap ) ? Qt::ElideNone : m_elideMode;
+    return ( wrapMode() != QskTextOptions::NoWrap ) ?
+        Qt::ElideNone : static_cast< Qt::TextElideMode >( m_elideMode );
 }
 
 inline void QskTextOptions::setWrapMode( WrapMode wrapMode ) noexcept