2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/install/controller/archive_download.php b/phpBB/phpbb/install/controller/archive_download.php
index a0f0ba181d..eabc0a9976 100644
--- a/phpBB/phpbb/install/controller/archive_download.php
+++ b/phpBB/phpbb/install/controller/archive_download.php
@@ -46,9 +46,9 @@ class archive_download
 	 */
 	public function conflict_archive()
 	{
-		$filename = $this->installer_config->get('update_file_conflict_archive', false);
+		$filename = $this->installer_config->get('update_file_conflict_archive', '');
 
-		if (!$filename)
+		if (empty($filename))
 		{
 			throw new http_exception(404, 'URL_NOT_FOUND');
 		}
@@ -65,7 +65,7 @@ class archive_download
 	{
 		$filename = $this->installer_config->get('update_file_archive', '');
 
-		if (!$filename)
+		if (empty($filename))
 		{
 			throw new http_exception(404, 'URL_NOT_FOUND');
 		}
diff --git a/phpBB/phpbb/install/module/update_database/task/update.php b/phpBB/phpbb/install/module/update_database/task/update.php
index 84ec6f73f5..4b2baf2c23 100644
--- a/phpBB/phpbb/install/module/update_database/task/update.php
+++ b/phpBB/phpbb/install/module/update_database/task/update.php
@@ -140,7 +140,7 @@ class update extends task_base
 			->get_classes();
 
 		$this->migrator->set_migrations($migrations);
-		$migration_count = count($migrations);
+		$migration_count = count($this->migrator->get_migrations());
 		$this->iohandler->set_task_count($migration_count, true);
 		$progress_count = $this->installer_config->get('database_update_count', 0);