diff --git a/src/libkwineffects/anidata.cpp b/src/libkwineffects/anidata.cpp
index 7ed53ddd00..672873e9d7 100644
--- a/src/libkwineffects/anidata.cpp
+++ b/src/libkwineffects/anidata.cpp
@@ -50,8 +50,8 @@ AniData::AniData()
     : attribute(AnimationEffect::Opacity)
     , customCurve(0) // Linear
     , meta(0)
-    , startTime(0)
     , frozenTime(-1)
+    , startTime(0)
     , waitAtSource(false)
     , keepAlive(true)
 {
@@ -65,8 +65,8 @@ AniData::AniData(AnimationEffect::Attribute a, int meta_, const FPx2 &to_,
     , from(from_)
     , to(to_)
     , meta(meta_)
-    , startTime(AnimationEffect::clock() + delay)
     , frozenTime(-1)
+    , startTime(AnimationEffect::clock() + delay)
     , fullScreenEffectLock(std::move(fullScreenEffectLock_))
     , waitAtSource(waitAtSource_)
     , keepAlive(keepAlive)
diff --git a/src/libkwineffects/kwinanimationeffect.cpp b/src/libkwineffects/kwinanimationeffect.cpp
index df20d7dfe4..ebfd6e71da 100644
--- a/src/libkwineffects/kwinanimationeffect.cpp
+++ b/src/libkwineffects/kwinanimationeffect.cpp
@@ -48,7 +48,6 @@ quint64 AnimationEffectPrivate::m_animCounter = 0;
 AnimationEffect::AnimationEffect()
     : d_ptr(new AnimationEffectPrivate())
 {
-    Q_D(AnimationEffect);
     if (!s_clock.isValid()) {
         s_clock.start();
     }
@@ -667,7 +666,7 @@ void AnimationEffect::postPaintScreen()
         bool invalidateLayerRect = false;
         int animCounter = 0;
         for (auto anim = entry->first.begin(); anim != entry->first.end();) {
-            if (anim->isActive() || anim->startTime > clock() && !anim->waitAtSource) {
+            if (anim->isActive() || (anim->startTime > clock() && !anim->waitAtSource)) {
                 ++anim;
                 ++animCounter;
                 continue;