diff --git a/ChangeLog b/ChangeLog
index 25665c97ee..cf696d911e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,7 +31,7 @@ Tue Feb  5 11:14:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  $NONINSTALLFILES.
 
 	* lib/mkmf.rb (init_mkmf): defaults $NONINSTALLFILES to backup and
-	  temporary filse.
+	  temporary files.
 
 Mon Feb  4 21:52:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -68,7 +68,7 @@ Sun Feb  3 21:13:13 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 Sat Feb  2 20:06:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/benchmark.rb (Benchmark::realtime): make Benchmark#realtime
-	  a bit faster.  a patch from Alexander Dymo <dymo@ukrpost.ua> in
+	  a bit faster.  a patch from Alexander Dymo <dymo AT ukrpost.ua> in
 	  [ruby-core:15337].
 
 Sat Feb  2 17:40:21 2008  NARUSE, Yui  <naruse@ruby-lang.org>
diff --git a/hash.c b/hash.c
index c3b07442ff..781beefc6b 100644
--- a/hash.c
+++ b/hash.c
@@ -1670,7 +1670,7 @@ rb_hash_rassoc(VALUE hash, VALUE obj)
 static VALUE
 rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
 {
-    VALUE ary;
+    VALUE ary, tmp;
 
     ary = rb_hash_to_a(hash);
     if (argc == 0) {