diff --git a/mod/register.php b/mod/register.php
index 21d5a1033c..da629a2143 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -70,9 +70,9 @@ function register_post(&$a) {
 	$err = '';
 
 
-	if(strlen($username) > 48)
+	if(mb_strlen($username) > 48)
 		$err .= t('Please use a shorter name.') . EOL;
-	if(strlen($username) < 3)
+	if(mb_strlen($username) < 3)
 		$err .= t('Name too short.') . EOL;
 
 	// I don't really like having this rule, but it cuts down
diff --git a/util/po2php.php b/util/po2php.php
index 1aa8adc1f8..34e99d1ab7 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -35,7 +35,7 @@ function po2php_run($argv, $argc) {
 		if ($l[0]=="#") $l="";
 		if (substr($l,0,15)=='"Plural-Forms: '){
 			$match=Array();
-			preg_match("|nplurals=([0-9]*); *plural=(.*)|", $l, $match);
+			preg_match("|nplurals=([0-9]*); *plural=(.*);|", $l, $match);
 			$cond = str_replace('n','$n',$match[2]);
 			$out .= 'function string_plural_select($n){'."\n";
 			$out .= '	return '.$cond.';'."\n";
diff --git a/view/photo_view.tpl b/view/photo_view.tpl
index 6287b0898e..5dbcabadf7 100644
--- a/view/photo_view.tpl
+++ b/view/photo_view.tpl
@@ -4,10 +4,10 @@
 <div id="photo-edit-link-wrap">
 {{ if $tools }}
 <a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
+|
 <a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
 {{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
+{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
 </div>
 
 {{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}