diff --git a/core/database.class.php b/core/database.class.php
index 84014118..27805521 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -292,7 +292,7 @@ class Database {
 			PDO::ATTR_PERSISTENT => true,
 			PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
 		);
-		if(defined(HIPHOP)) $this->db = new PDO(DATABASE_DSN, $db_user, $db_pass);
+		if(defined("HIPHOP")) $this->db = new PDO(DATABASE_DSN, $db_user, $db_pass);
 		else $this->db = new PDO(DATABASE_DSN, $db_user, $db_pass, $db_params);
 
 		$db_proto = $this->db->getAttribute(PDO::ATTR_DRIVER_NAME);
diff --git a/ext/setup/main.php b/ext/setup/main.php
index 28b5820c..fc0c3561 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -162,7 +162,7 @@ class SetupBlock extends Block {
 // }}}
 
 class Setup extends SimpleExtension {
-	public function onInitExt(SetupEvent $event) {
+	public function onInitExt(InitExtEvent $event) {
 		global $config;
 		$config->set_default_string("title", "Shimmie");
 		$config->set_default_string("front_page", "post/list");