diff --git a/core/user.class.php b/core/user.class.php
index 698c400b..1b43cb83 100644
--- a/core/user.class.php
+++ b/core/user.class.php
@@ -36,7 +36,7 @@ class User {
 
 	public static function by_session(Config $config, Database $database, $name, $session) {
 		$row = $database->get_row(
-				"SELECT * FROM user WHERE name = ? AND md5(concat(pass, ?)) = ?",
+				"SELECT * FROM users WHERE name = ? AND md5(concat(pass, ?)) = ?",
 				array($name, get_session_ip($config), $session)
 		);
 		return is_null($row) ? null : new User($config, $database, $row);
@@ -44,13 +44,13 @@ class User {
 
 	public static function by_id(Config $config, Database $database, $id) {
 		assert(is_numeric($id));
-		$row = $database->get_row("SELECT * FROM user WHERE id = ?", array($id));
+		$row = $database->get_row("SELECT * FROM users WHERE id = ?", array($id));
 		return is_null($row) ? null : new User($config, $database, $row);
 	}
 
 	public static function by_name(Config $config, Database $database, $name) {
 		assert(is_string($name));
-		$row = $database->get_row("SELECT * FROM user WHERE name = ?", array($name));
+		$row = $database->get_row("SELECT * FROM users WHERE name = ?", array($name));
 		return is_null($row) ? null : new User($config, $database, $row);
 	}
 
@@ -58,7 +58,7 @@ class User {
 		assert(is_string($name));
 		assert(is_string($hash));
 		assert(strlen($hash) == 32);
-		$row = $database->get_row("SELECT * FROM user WHERE name = ? AND pass = ?", array($name, $hash));
+		$row = $database->get_row("SELECT * FROM users WHERE name = ? AND pass = ?", array($name, $hash));
 		return is_null($row) ? null : new User($config, $database, $row);
 	}
 
diff --git a/ext/view/main.php b/ext/view/main.php
index 679b42d0..a7595ecb 100644
--- a/ext/view/main.php
+++ b/ext/view/main.php
@@ -5,7 +5,7 @@ class ImageInfoBoxBuildingEvent extends Event {
 	var $image;
 	var $user;
 
-	public function ImageInfoBoxBuildingEvent($image, $user) {
+	public function ImageInfoBoxBuildingEvent(Image $image, User $user) {
 		$this->image = $image;
 		$this->user = $user;
 	}
@@ -29,7 +29,7 @@ class ImageAdminBlockBuildingEvent extends Event {
 	var $image = null;
 	var $user = null;
 
-	public function ImageAdminBlockBuildingEvent($image, $user) {
+	public function ImageAdminBlockBuildingEvent(Image $image, User $user) {
 		$this->image = $image;
 		$this->user = $user;
 	}