diff --git a/Db/dballoc.h b/Db/dballoc.h
index 1da91d4..9a9d0ab 100644
--- a/Db/dballoc.h
+++ b/Db/dballoc.h
@@ -3,7 +3,7 @@
 * $Version: $
 *
 * Copyright (c) Tanel Tammet 2004,2005,2006,2007,2008,2009
-* Copyright (c) Priit Järv 2013
+* Copyright (c) Priit Järv 2013
 *
 * Contact: tanel.tammet@gmail.com
 *
diff --git a/Db/dbcompare.c b/Db/dbcompare.c
index d677a60..c8ddbac 100644
--- a/Db/dbcompare.c
+++ b/Db/dbcompare.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2010,2011,2012,2013
+* Copyright (c) Priit Järv 2010,2011,2012,2013
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbcompare.h b/Db/dbcompare.h
index 49c578e..4d0e315 100644
--- a/Db/dbcompare.h
+++ b/Db/dbcompare.h
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2010
+* Copyright (c) Priit Järv 2010
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbdump.c b/Db/dbdump.c
index 5cc740c..ecab351 100644
--- a/Db/dbdump.c
+++ b/Db/dbdump.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Andri Rebane 2009, Priit Järv 2009,2010,2013,2014
+* Copyright (c) Andri Rebane 2009, Priit Järv 2009,2010,2013,2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbfeatures.h b/Db/dbfeatures.h
index db37527..dfec67b 100644
--- a/Db/dbfeatures.h
+++ b/Db/dbfeatures.h
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2010
+* Copyright (c) Priit Järv 2010
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbindex.c b/Db/dbindex.c
index 89e2a54..65b9ddc 100644
--- a/Db/dbindex.c
+++ b/Db/dbindex.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Enar Reilent 2009, Priit Järv 2010,2011,2013,2014
+* Copyright (c) Enar Reilent 2009, Priit Järv 2010,2011,2013,2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbindex.h b/Db/dbindex.h
index b349c09..cbb46f2 100644
--- a/Db/dbindex.h
+++ b/Db/dbindex.h
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Enar Reilent 2009, Priit Järv 2010,2011,2013
+* Copyright (c) Enar Reilent 2009, Priit Järv 2010,2011,2013
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbjson.c b/Db/dbjson.c
index 94dc083..b80c020 100644
--- a/Db/dbjson.c
+++ b/Db/dbjson.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit J�rv 2013, 2014
+* Copyright (c) Priit Järv 2013, 2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbjson.h b/Db/dbjson.h
index 0377265..75eadbd 100644
--- a/Db/dbjson.h
+++ b/Db/dbjson.h
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit J�rv 2013, 2014
+* Copyright (c) Priit Järv 2013, 2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dblock.c b/Db/dblock.c
index edcba9a..29ced95 100644
--- a/Db/dblock.c
+++ b/Db/dblock.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2009, 2010, 2011, 2013, 2014
+* Copyright (c) Priit Järv 2009, 2010, 2011, 2013, 2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dblock.h b/Db/dblock.h
index 059f9e8..4341d1a 100644
--- a/Db/dblock.h
+++ b/Db/dblock.h
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2009, 2013, 2014
+* Copyright (c) Priit Järv 2009, 2013, 2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dblog.c b/Db/dblog.c
index 1e9ff90..b9c5a47 100644
--- a/Db/dblog.c
+++ b/Db/dblog.c
@@ -3,7 +3,7 @@
 * $Version: $
 *
 * Copyright (c) Andri Rebane 2009
-* Copyright (c) Priit J�rv 2013,2014
+* Copyright (c) Priit Järv 2013,2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dblog.h b/Db/dblog.h
index 987da36..cf72c83 100644
--- a/Db/dblog.h
+++ b/Db/dblog.h
@@ -3,7 +3,7 @@
 * $Version: $
 *
 * Copyright (c) Andri Rebane 2009
-* Copyright (c) Priit J�rv 2013,2014
+* Copyright (c) Priit Järv 2013,2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbquery.c b/Db/dbquery.c
index 1f3f5c7..f533691 100644
--- a/Db/dbquery.c
+++ b/Db/dbquery.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit J�rv 2010,2011,2013,2014
+* Copyright (c) Priit Järv 2010,2011,2013,2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbquery.h b/Db/dbquery.h
index e7d5044..3f6ee70 100644
--- a/Db/dbquery.h
+++ b/Db/dbquery.h
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit J�rv 2010,2011,2013
+* Copyright (c) Priit Järv 2010,2011,2013
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbschema.c b/Db/dbschema.c
index 557c56c..58575d8 100644
--- a/Db/dbschema.c
+++ b/Db/dbschema.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2013, 2014
+* Copyright (c) Priit Järv 2013, 2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbschema.h b/Db/dbschema.h
index df22180..0776d92 100644
--- a/Db/dbschema.h
+++ b/Db/dbschema.h
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2013
+* Copyright (c) Priit Järv 2013
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/dbutil.c b/Db/dbutil.c
index 28653e8..5716487 100644
--- a/Db/dbutil.c
+++ b/Db/dbutil.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit J�rv 2010,2011,2012,2013
+* Copyright (c) Priit Järv 2010,2011,2012,2013
 *
 * Minor mods by Tanel Tammet. Triple handler for raptor and raptor
 * rdf parsing originally written by Tanel Tammet.
diff --git a/Db/dbutil.h b/Db/dbutil.h
index 96eb381..6270224 100644
--- a/Db/dbutil.h
+++ b/Db/dbutil.h
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit J�rv 2010
+* Copyright (c) Priit Järv 2010
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/indexapi.h b/Db/indexapi.h
index e6342f6..9693026 100644
--- a/Db/indexapi.h
+++ b/Db/indexapi.h
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2011
+* Copyright (c) Priit Järv 2011
 *
 * This file is part of WhiteDB
 *
diff --git a/Db/rdfapi.h b/Db/rdfapi.h
index ba96c9d..f7560de 100644
--- a/Db/rdfapi.h
+++ b/Db/rdfapi.h
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2010
+* Copyright (c) Priit Järv 2010
 *
 * This file is part of WhiteDB
 *
diff --git a/Doc/whitedb.7 b/Doc/whitedb.7
index 1fed43e..4721dcb 100644
--- a/Doc/whitedb.7
+++ b/Doc/whitedb.7
@@ -46,6 +46,6 @@ The Whitedb web site can be found at:
 .SH REPORTING PROBLEMS
 Please use either https://github.com/priitj/whitedb or email to authors.
 .SH AUTHORS
-Copyright (C) 2008-2014 Tanel Tammet (tanel.tammet@gmail.com), Priit Järv (priit@whitedb.org)
+Copyright (C) 2008-2014 Tanel Tammet (tanel.tammet@gmail.com), Priit Järv (priit@whitedb.org)
 
 
diff --git a/Examples/demo.c b/Examples/demo.c
index 9a0ff25..96b46fc 100644
--- a/Examples/demo.c
+++ b/Examples/demo.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2010
+* Copyright (c) Priit Järv 2010
 *
 * Minor mods by Tanel Tammet
 *
diff --git a/Examples/query.c b/Examples/query.c
index 7f10b0c..cd3ae59 100644
--- a/Examples/query.c
+++ b/Examples/query.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2010,2011,2013
+* Copyright (c) Priit Järv 2010,2011,2013
 *
 * This file is part of WhiteDB
 *
diff --git a/Main/gendata.c b/Main/gendata.c
index 6a59f18..07aa59f 100644
--- a/Main/gendata.c
+++ b/Main/gendata.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2014
+* Copyright (c) Priit Järv 2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Main/selftest.c b/Main/selftest.c
index 626bf1d..ec4bf00 100644
--- a/Main/selftest.c
+++ b/Main/selftest.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2014
+* Copyright (c) Priit Järv 2014
 *
 * This file is part of WhiteDB
 *
diff --git a/Main/stresstest.c b/Main/stresstest.c
index 842e83f..69a0831 100644
--- a/Main/stresstest.c
+++ b/Main/stresstest.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2009
+* Copyright (c) Priit Järv 2009
 *
 * This file is part of WhiteDB
 *
diff --git a/Main/wgdb.c b/Main/wgdb.c
index 4750c6a..26a0a69 100644
--- a/Main/wgdb.c
+++ b/Main/wgdb.c
@@ -4,7 +4,7 @@
 *
 * Copyright (c) Tanel Tammet 2004,2005,2006,2007,2008,2009
 * Copyright (c) Enar Reilent 2009
-* Copyright (c) Priit Järv 2010,2011,2012,2013,2014
+* Copyright (c) Priit Järv 2010,2011,2012,2013,2014
 *
 * Contact: tanel.tammet@gmail.com
 *
diff --git a/Python/WGandalf.py b/Python/WGandalf.py
index 5318e88..e0a7971 100644
--- a/Python/WGandalf.py
+++ b/Python/WGandalf.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: latin-1 -*-
 #
-# Copyright (c) Priit Järv 2013
+# Copyright (c) Priit Järv 2013
 #
 # This file is part of WhiteDB
 #
diff --git a/Python/tests.py b/Python/tests.py
index e1e486a..2cce449 100644
--- a/Python/tests.py
+++ b/Python/tests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: latin-1 -*-
 #
-# Copyright (c) Priit Järv 2012,2013
+# Copyright (c) Priit Järv 2012,2013
 #
 # This file is part of WhiteDB
 #
diff --git a/Python/wgdbmodule.c b/Python/wgdbmodule.c
index ffe9822..a80d6c9 100644
--- a/Python/wgdbmodule.c
+++ b/Python/wgdbmodule.c
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2009, 2010, 2013
+* Copyright (c) Priit Järv 2009, 2010, 2013
 * Copyright (c) Vladimir Ulogov 2016
 *
 * This file is part of WhiteDB
diff --git a/Python/whitedb.py b/Python/whitedb.py
index b17b019..6211f61 100644
--- a/Python/whitedb.py
+++ b/Python/whitedb.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: latin-1 -*-
 #
-# Copyright (c) Priit Järv 2009, 2010, 2013
+# Copyright (c) Priit Järv 2009, 2010, 2013
 #
 # This file is part of WhiteDB
 #
diff --git a/Test/dbtest.c b/Test/dbtest.c
index e0a6f58..9306b51 100644
--- a/Test/dbtest.c
+++ b/Test/dbtest.c
@@ -3,7 +3,7 @@
 * $Version: $
 *
 * Copyright (c) Tanel Tammet 2004,2005,2006,2007,2008,2009
-* Copyright (c) Priit Järv 2010, 2011, 2012, 2013, 2014
+* Copyright (c) Priit Järv 2010, 2011, 2012, 2013, 2014
 *
 * Contact: tanel.tammet@gmail.com
 *
@@ -1362,7 +1362,7 @@ static gint wg_check_parse_encode(void* db, int printlevel) {
     "", /* empty string - NULL */
     " ", /* space - string */
     "\r\t \n\r\t  \b\xff", /* various whitespace and other junk */
-    "üöäõõõü ÄÖÜÕ", /* ISO-8859-1 encoded string */
+    "\xfc\xf6\xe4\xf5\xf5\xf5\xfc \xc4\xd6\xdc\xd5", /* ISO-8859-1 encoded string */
     "\xc3\xb5\xc3\xa4\xc3\xb6\xc3\xbc \xc3\x95\xc3\x84\xc3\x96\xc3\x9c", /* UTF-8 */
     "0", /* integer */
     "5435354534", /* a large integer, parsed as string if strtol() is 32-bit */
diff --git a/java/jni/src/native/whitedbDriver.c b/java/jni/src/native/whitedbDriver.c
index d1cf7f8..dec5497 100644
--- a/java/jni/src/native/whitedbDriver.c
+++ b/java/jni/src/native/whitedbDriver.c
@@ -3,7 +3,7 @@
 * $Version: $
 *
 * Copyright (c) Andres Puusepp 2009
-* Copyright (c) Priit Järv 2013
+* Copyright (c) Priit Järv 2013
 *
 * This file is part of WhiteDB
 *
diff --git a/java/jni/src/whitedb/driver/WhiteDB.java b/java/jni/src/whitedb/driver/WhiteDB.java
index a3e6009..8b22666 100644
--- a/java/jni/src/whitedb/driver/WhiteDB.java
+++ b/java/jni/src/whitedb/driver/WhiteDB.java
@@ -3,7 +3,7 @@
 * $Version: $
 *
 * Copyright (c) Andres Puusepp 2009
-* Copyright (c) Priit Järv 2013
+* Copyright (c) Priit Järv 2013
 *
 * This file is part of WhiteDB
 *
diff --git a/java/jni/src/whitedb/driver/tests.java b/java/jni/src/whitedb/driver/tests.java
index 52a0b90..b9b043f 100644
--- a/java/jni/src/whitedb/driver/tests.java
+++ b/java/jni/src/whitedb/driver/tests.java
@@ -3,7 +3,7 @@
 * $Version: $
 *
 * Copyright (c) Andres Puusepp 2009
-* Copyright (c) Priit Järv 2013
+* Copyright (c) Priit Järv 2013
 *
 * This file is part of WhiteDB
 *
diff --git a/java/jni/src/whitedb/holder/Query.java b/java/jni/src/whitedb/holder/Query.java
index f052501..21c7424 100644
--- a/java/jni/src/whitedb/holder/Query.java
+++ b/java/jni/src/whitedb/holder/Query.java
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2013
+* Copyright (c) Priit Järv 2013
 *
 * This file is part of WhiteDB
 *
diff --git a/java/jni/src/whitedb/util/ArgListEntry.java b/java/jni/src/whitedb/util/ArgListEntry.java
index 83c3fbd..f83a47f 100644
--- a/java/jni/src/whitedb/util/ArgListEntry.java
+++ b/java/jni/src/whitedb/util/ArgListEntry.java
@@ -2,7 +2,7 @@
 * $Id:  $
 * $Version: $
 *
-* Copyright (c) Priit Järv 2013
+* Copyright (c) Priit Järv 2013
 *
 * This file is part of WhiteDB
 *