diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 75fb301c01..531dd6f687 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2191,8 +2191,10 @@ function avatar_delete($mode, $row, $clean_db = false)
 	}
 	catch (\phpbb\storage\exception\exception $e)
 	{
-		return false;
+		// Fail is covered by return statement below
 	}
+
+	return false;
 }
 
 /**
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 6476fe0f3a..d0885dc620 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -311,7 +311,7 @@ if (!$get_info)
 	$convertor = array(
 		'test_file'				=> 'viewtopic.php',
 
-		'avatar_path'			=> get_config_value('storage\\avatar\\config\\path') . '/',
+		'avatar_path'			=> get_config_value('avatar_path') . '/',
 		'avatar_gallery_path'	=> get_config_value('avatar_gallery_path') . '/',
 		'smilies_path'			=> get_config_value('smilies_path') . '/',
 		'upload_path'			=> (defined('MOD_ATTACHMENT')) ? phpbb_get_files_dir() . '/' : '',