diff --git a/src/common/QskMetaInvokable.cpp b/src/common/QskMetaInvokable.cpp
index da217c27..157c02a2 100644
--- a/src/common/QskMetaInvokable.cpp
+++ b/src/common/QskMetaInvokable.cpp
@@ -152,7 +152,7 @@ QMetaMethod qskNotifySignal( const QMetaObject* metaObject, const char* property
 
 static void qskInvokeMetaCall(
     QObject* object, const QMetaObject* metaObject,
-    QMetaObject::Call call, int offset, int index, void* argv[],
+    QMetaObject::Call call, ushort offset, ushort index, void* argv[],
     Qt::ConnectionType connectionType )
 {
     QPointer< QObject > receiver( object );
@@ -196,6 +196,7 @@ static void qskInvokeMetaCall(
 
             QSemaphore semaphore;
 
+            Q_ASSERT( metaObject == nullptr || receiver->metaObject() == metaObject );
             qskInvokeMetaCallQueued( receiver, call,
                 offset, index, argv, &semaphore );
 
@@ -256,6 +257,7 @@ static void qskInvokeMetaCall(
                 return;
             }
 
+            Q_ASSERT( metaObject == nullptr || receiver->metaObject() == metaObject );
             qskInvokeMetaCallQueued( object, call, offset, index, arguments, nullptr );
 
             break;
diff --git a/src/controls/QskPopup.cpp b/src/controls/QskPopup.cpp
index 496e3f55..c03ddcf1 100644
--- a/src/controls/QskPopup.cpp
+++ b/src/controls/QskPopup.cpp
@@ -382,7 +382,7 @@ bool QskPopup::hasFaderEffect() const
 
 void QskPopup::setPopupFlags( PopupFlags flags )
 {
-    const auto newFlags = static_cast< int >( m_data->flags );
+    const auto newFlags = static_cast< int >( flags );
 
     if ( newFlags != m_data->flags )
     {
diff --git a/src/controls/QskSkinManager.cpp b/src/controls/QskSkinManager.cpp
index c5317df3..f9e0749c 100644
--- a/src/controls/QskSkinManager.cpp
+++ b/src/controls/QskSkinManager.cpp
@@ -234,11 +234,11 @@ namespace
 
         void removeFactory( const QString& factoryId )
         {
-            const auto it = m_factoryMap.find( factoryId );
-            if ( it == m_factoryMap.end() )
+            const auto itFactory = m_factoryMap.find( factoryId );
+            if ( itFactory == m_factoryMap.end() )
                 return;
 
-            m_factoryMap.erase( it );
+            m_factoryMap.erase( itFactory );
 
             if ( m_isValid )
             {
diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp
index bfacfce4..d6ce3af1 100644
--- a/src/controls/QskSkinnable.cpp
+++ b/src/controls/QskSkinnable.cpp
@@ -753,10 +753,12 @@ QskColorFilter QskSkinnable::effectiveGraphicFilter(
     aspect.setSection( QskAspect::Body );
     aspect.setVariation( QskAspect::NoVariation );
 
-    const auto v = animatedHint( aspect, nullptr );
+    {
+        const auto v = animatedHint( aspect, nullptr );
 
-    if ( v.canConvert< QskColorFilter >() )
-        return v.value< QskColorFilter >();
+        if ( v.canConvert< QskColorFilter >() )
+            return v.value< QskColorFilter >();
+    }
 
     if ( auto control = owningControl() )
     {
@@ -816,16 +818,18 @@ QskAnimationHint QskSkinnable::effectiveAnimation(
 
     QskAnimationHint hint;
 
-    const auto a = m_data->hintTable.resolvedAnimator( aspect, hint );
-    if ( a.isAnimator() )
     {
-        if ( status )
+        const auto a = m_data->hintTable.resolvedAnimator( aspect, hint );
+        if ( a.isAnimator() )
         {
-            status->source = QskSkinHintStatus::Skinnable;
-            status->aspect = a;
-        }
+            if ( status )
+            {
+                status->source = QskSkinHintStatus::Skinnable;
+                status->aspect = a;
+            }
 
-        return hint;
+            return hint;
+        }
     }
 
     if ( auto skin = effectiveSkin() )