diff --git a/ChangeLog b/ChangeLog
index 090d9c53e..b524b8578 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-15  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-alpha.c (clutter_smoothstep_inc): Use the
+	correct type for parameters, to avoid overflow  (Ali Sabil).
+
+	* clutter/clutter-behaviour-opacity.c: Use the right format
+	when printing the unsigned alpha value and opacity to the
+	debug output.
+
 2007-08-14  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-container.[ch]:
diff --git a/clutter/clutter-alpha.c b/clutter/clutter-alpha.c
index c25a4b27f..d2d1437c0 100644
--- a/clutter/clutter-alpha.c
+++ b/clutter/clutter-alpha.c
@@ -748,8 +748,8 @@ clutter_smoothstep_inc_func (ClutterAlpha  *alpha,
   ClutterTimeline    *timeline;
   gint                frame;
   gint                n_frames;
-  gint32              r; 
-  gint32              x; 
+  guint32             r; 
+  guint32             x; 
 
   /*
    * The smoothstep function uses f(x) = -2x^3 + 3x^2 where x is from <0,1>,
diff --git a/clutter/clutter-behaviour-opacity.c b/clutter/clutter-behaviour-opacity.c
index ee52422aa..f3f609dc3 100644
--- a/clutter/clutter-behaviour-opacity.c
+++ b/clutter/clutter-behaviour-opacity.c
@@ -100,7 +100,9 @@ clutter_behaviour_alpha_notify (ClutterBehaviour *behave,
             / CLUTTER_ALPHA_MAX_ALPHA
             + priv->opacity_start;
 
-  CLUTTER_NOTE (BEHAVIOUR, "alpha: %i, opacity: %i", alpha_value, opacity);
+  CLUTTER_NOTE (BEHAVIOUR, "alpha: %u, opacity: %u",
+                alpha_value,
+                opacity);
 
   clutter_behaviour_actors_foreach (behave,
 				    alpha_notify_foreach,