diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 6e6afae61..8f2fa89ad 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-15  Dirk Herrmann  <dirk@dirk-herrmanns-seiten.de>
+
+	* dynl.c (SET_DYNL_HANDLE): Add cast to scm_t_bits to make
+	explicit what happens.
+
+	* guardians.c (TCONC_IN): Use SCM_SET_CELL_OBJECT_x rather than
+	SCM_SET_CELL_WORD_x when writing scheme objets to cell elements.
+
 2004-05-11  Marius Vollmer  <mvo@zagadka.de>
 
 	* scmsigs.c (scm_sigaction_for_thread): Validate that the handler
diff --git a/libguile/dynl.c b/libguile/dynl.c
index dbb7ae905..d6175a76c 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -113,7 +113,7 @@ scm_t_bits scm_tc16_dynamic_obj;
 
 #define DYNL_FILENAME         SCM_SMOB_OBJECT
 #define DYNL_HANDLE(x)        ((void *) SCM_SMOB_DATA_2 (x))
-#define SET_DYNL_HANDLE(x, v) (SCM_SET_SMOB_DATA_2 ((x), (v)))
+#define SET_DYNL_HANDLE(x, v) (SCM_SET_SMOB_DATA_2 ((x), (scm_t_bits) (v)))
 
 
 static SCM
diff --git a/libguile/guardians.c b/libguile/guardians.c
index ffcbac688..7fe01af7b 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -62,8 +62,8 @@ typedef struct t_tconc
 #define TCONC_IN(tc, obj, pair) \
 do { \
   SCM_SETCAR ((tc).tail, obj); \
-  SCM_SET_CELL_WORD_1 (pair, SCM_EOL); \
-  SCM_SET_CELL_WORD_0 (pair, SCM_BOOL_F); \
+  SCM_SET_CELL_OBJECT_1 (pair, SCM_EOL); \
+  SCM_SET_CELL_OBJECT_0 (pair, SCM_BOOL_F); \
   SCM_SETCDR ((tc).tail, pair); \
   (tc).tail = pair; \
 } while (0)