diff --git a/src/common/QskTextOptions.h b/src/common/QskTextOptions.h
index c91c8fa3..7f4ff9d9 100644
--- a/src/common/QskTextOptions.h
+++ b/src/common/QskTextOptions.h
@@ -37,7 +37,6 @@ public:
         WordWrap = QTextOption::WordWrap,
         WrapAnywhere = QTextOption::WrapAnywhere,
         Wrap = QTextOption::WrapAtWordBoundaryOrAnywhere
-
     };
     Q_ENUM( WrapMode )
 
diff --git a/src/controls/QskEvent.cpp b/src/controls/QskEvent.cpp
index a1ee84ec..e8ab64c6 100644
--- a/src/controls/QskEvent.cpp
+++ b/src/controls/QskEvent.cpp
@@ -44,7 +44,7 @@ bool QskGeometryChangeEvent::isMoved() const
         ( m_rect.y() != m_oldRect.y() );
 }
 
-// -- QskGeometryChangeEvent
+// -- QskWindowChangeEvent
 
 QskWindowChangeEvent::QskWindowChangeEvent(
         QQuickWindow* oldWindow, QQuickWindow* window ):
diff --git a/src/controls/QskInputPanel.cpp b/src/controls/QskInputPanel.cpp
index 4395c987..8be6692f 100644
--- a/src/controls/QskInputPanel.cpp
+++ b/src/controls/QskInputPanel.cpp
@@ -338,6 +338,8 @@ QString QskInputPanel::displayLanguageName() const
                 default:
                     return QStringLiteral( "English (UK)" );
             }
+
+            break;
         }
 
         case QLocale::Spanish:
diff --git a/src/controls/QskRangeControl.cpp b/src/controls/QskRangeControl.cpp
index efd3fb11..94ec7869 100644
--- a/src/controls/QskRangeControl.cpp
+++ b/src/controls/QskRangeControl.cpp
@@ -278,6 +278,9 @@ void QskRangeControl::keyPressEvent( QKeyEvent* event )
 
 void QskRangeControl::wheelEvent( QWheelEvent* event )
 {
+    if( isReadOnly() )
+        return;
+
     const int steps = event->delta() / 120;
     setValue( m_data->value + steps * m_data->stepSize );
 }
diff --git a/src/controls/QskVariantAnimator.cpp b/src/controls/QskVariantAnimator.cpp
index 817f4eee..a9294532 100644
--- a/src/controls/QskVariantAnimator.cpp
+++ b/src/controls/QskVariantAnimator.cpp
@@ -99,6 +99,9 @@ void QskVariantAnimator::advance( qreal progress )
 {
     if ( m_interpolator )
     {
+        if ( qFuzzyCompare( progress, 1.0 ) )
+            progress = 1.0;
+
         m_currentValue = qskInterpolate( m_interpolator,
             m_startValue, m_endValue, progress );
     }
diff --git a/src/graphic/QskPainterCommand.h b/src/graphic/QskPainterCommand.h
index 441ad291..d970b637 100644
--- a/src/graphic/QskPainterCommand.h
+++ b/src/graphic/QskPainterCommand.h
@@ -54,8 +54,17 @@ public:
     };
 
     //! Attributes of a state change
-    struct StateData
+    class StateData
     {
+    public:
+        StateData():
+            backgroundMode( Qt::TransparentMode ),
+            clipOperation( Qt::NoClip ),
+            isClipEnabled( false ),
+            compositionMode( QPainter::CompositionMode_SourceOver )
+        {
+        }
+
         QPaintEngine::DirtyFlags flags;
 
         QPen pen;