diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt
index 0890e3176..52dad9e99 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt
@@ -102,11 +102,11 @@ class NumberDialog : AppCompatDialogFragment() {
         val notes = view.notes.text.toString()
         onToggle(value, notes)
         requireDialog().dismiss()
-        val v = requireActivity().findViewById<LinearLayout>(R.id.konfettiLayout)
+        val konfettiView = requireActivity().findViewById<LinearLayout>(R.id.konfettiLayout)
 
         if (value > 0.0) {
-            showConfetti(v)
-
+            //To motivate, show confetti even if some value is present
+            showConfetti(konfettiView)
         }
     }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
index 891abb78d..6a5bd5a49 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
@@ -89,7 +89,7 @@ class CheckmarkButtonView(
         setOnLongClickListener(this)
     }
 
-    fun performToggle(v: View) {
+    fun performToggle(view: View) {
         value = Entry.nextToggleValue(
             value = value,
             isSkipEnabled = preferences.isSkipEnabled,
@@ -98,7 +98,7 @@ class CheckmarkButtonView(
         onToggle(value, notes)
         performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
         when (value) {
-            YES_MANUAL -> showConfetti(v.rootView)
+            YES_MANUAL -> showConfetti(view.rootView)
         }
         invalidate()
     }