diff --git a/about/people/people.en.xml b/about/people/people.en.xml
index d2654c225c..c7d0d31e1e 100644
--- a/about/people/people.en.xml
+++ b/about/people/people.en.xml
@@ -162,13 +162,6 @@
     <avatar>/about/husovec/husovec-avatar.jpg</avatar>
   </person>
 
-  <person id="jyrinki" avatar="no" teams="main, fi">
-    <name>Timo Jyrinki</name>
-    <country>FI</country>
-    <function country="FI">deputy/m</function>
-    <email>jyrinki (at) fsfeurope (dot) org</email>
-  </person>
-
   <person id="jean" avatar="yes" teams="main, fr, de">
     <name>Nicolas Jean</name>
     <country>DE</country>
@@ -197,10 +190,11 @@
     <avatar>/about/jensch/jensch-avatar.jpg</avatar>
   </person>    
 
-  <person id="jyrinki" avatar="yes" teams="fi">
+  <person id="jyrinki" avatar="yes" teams="main, fi">
     <name>Timo Jyrinki</name>
     <country>FI</country>
     <function volunteers="translators-fi">coordinator/m</function>
+    <function country="FI">deputy/m</function>
     <email>mirv (at) fsfe (dot) org</email>
     <link>http://iki.fi/tjyrinki/</link>
     <avatar>/about/jyrinki/jyrinki-avatar.jpg</avatar>
@@ -210,7 +204,7 @@
     <name>Otto Kekäläinen</name>
     <country>FI</country>
     <function country="FI">coordinator/m</function>
-    <email>kekalainen (at) fsfeurope (dot) org</email>
+    <email>otto (at) fsfe (dot) org</email>
     <avatar>/about/kekalainen/kekalainen-avatar.jpg</avatar>
   </person>
 
diff --git a/about/team.xsl b/about/team.xsl
index ec29176afd..2bb43688f8 100644
--- a/about/team.xsl
+++ b/about/team.xsl
@@ -8,7 +8,7 @@
   <!-- 
     For documentation on tagging (e.g. display a people list), take a
     look at the documentation under
-      /tools/xsltsl/tagging-documentation.txt
+      /tools/xsltsl/documentation-tagging.txt
   -->
   
   <!-- Fill dynamic content -->
@@ -28,4 +28,4 @@
     </xsl:copy>
   </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/news/2011/news-20111213-01.en.xhtml b/news/2011/news-20111213-01.en.xhtml
index b547535776..b6deb894c9 100644
--- a/news/2011/news-20111213-01.en.xhtml
+++ b/news/2011/news-20111213-01.en.xhtml
@@ -87,7 +87,7 @@ Linux Terminal Server Project.
  </body>
  <tags>
   <tag>front-page</tag>
-  <tag>Finland</tag>
+  <tag>fi</tag>
   <tag>Free Software</tag>
   <tag>procurement</tag>
  </tags>
diff --git a/news/2012/news-20120619-01.en.xhtml b/news/2012/news-20120619-01.en.xhtml
index 98dedd1d6e..85fef75dc2 100644
--- a/news/2012/news-20120619-01.en.xhtml
+++ b/news/2012/news-20120619-01.en.xhtml
@@ -57,5 +57,6 @@ gerloff@fsfe.org<br/>
  <tags>
   <tag>front-page</tag>
   <tag>procurement</tag>
+  <tag>fi</tag>
  </tags>
 </html>