diff --git a/phpBB/adm/style/detailled_message_body.html b/phpBB/adm/style/detailed_message_body.html
similarity index 100%
rename from phpBB/adm/style/detailled_message_body.html
rename to phpBB/adm/style/detailed_message_body.html
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index d9fe8df039..fe0a6184cd 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -62,10 +62,10 @@ class acp_extensions
 		{
 			case 'catalog':
 				$this->catalog_mode($id, $mode);
-				break;
+			break;
 			default:
 				$this->main_mode($id, $mode);
-				break;
+			break;
 		}
 	}
 
@@ -155,7 +155,7 @@ class acp_extensions
 					$this->config->set('extension_force_unstable', false);
 					trigger_error($this->user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
 				}
-				break;
+			break;
 
 			case 'list':
 			default:
@@ -464,7 +464,7 @@ class acp_extensions
 					)
 				);
 
-				break;
+			break;
 			case 'remove':
 				$this->page_title = 'ACP_EXTENSIONS_REMOVE';
 
@@ -503,7 +503,7 @@ class acp_extensions
 					)
 				);
 
-				break;
+			break;
 			case 'update':
 				$this->page_title = 'ACP_EXTENSIONS_UPDATE';
 
@@ -542,7 +542,7 @@ class acp_extensions
 					)
 				);
 
-				break;
+			break;
 			case 'manage':
 				$this->page_title = 'ACP_EXTENSIONS_MANAGE';
 
@@ -581,7 +581,7 @@ class acp_extensions
 					)
 				);
 
-				break;
+			break;
 			case 'list':
 			default:
 				if (!$this->config['exts_composer_packagist'] && $this->request->is_set('enable_packagist') && confirm_box(true))
@@ -676,7 +676,7 @@ class acp_extensions
 
 				add_form_key('catalog_settings');
 
-				break;
+			break;
 		}
 	}
 
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 22b78fe218..6939197034 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -250,7 +250,7 @@ $lang = array_merge($lang, array(
 	'COMPOSER_UPDATING_DEPENDENCIES'	=> 'Updating packages',
 	'COMPOSER_LOADING_REPOSITORIES'		=> 'Loading remote repositories with package information',
 	'COMPOSER_ERROR_CONFLICT'			=> 'Your requirements could not be resolved to an installable set of packages.',
-	'COMPOSER_REPOSITORY_UNAVAILABLE'	=> 'An error occurred when fetching the repository %s.',
+	'COMPOSER_REPOSITORY_UNAVAILABLE'	=> 'An error occurred while fetching the repository %s.',
 	'COMPOSER_INSTALLING_PACKAGE'		=> '  - Installing %1$s (%2$s)',
 	'COMPOSER_DELETING'					=> '  - Deleting %s',
 	'COMPOSER_UPDATE_NOTHING'			=> 'Nothing to update',
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index a32676f31a..280a483d89 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -41,15 +41,15 @@ $lang = array_merge($lang, array(
 	'EXTENSION_ALREADY_MANAGED'					=> 'The “%s” extension is already managed.',
 	'EXTENSION_CANNOT_MANAGE_FILESYSTEM_ERROR'	=> 'The “%s” extension cannot be managed because the existing files could not be removed from the filesystem.',
 	'EXTENSION_CANNOT_MANAGE_INSTALL_ERROR'		=> 'The “%s” extension could not be installed. The prior installation of this extension has been restored.',
-	'EXTENSION_MANAGED_WITH_CLEAN_ERROR'		=> 'The “%1$s” extension has been installed but an error occurred and the old files have not been removed. You might want to delete the “%2$s” files manually.',
-	'EXTENSION_MANAGED_WITH_ENABLE_ERROR'		=> 'The “%s” extension has been installed but an error occurred when enabling it.',
+	'EXTENSION_MANAGED_WITH_CLEAN_ERROR'		=> 'The “%1$s” extension has been installed but an error occurred and the old files could not be removed. You might want to delete the “%2$s” files manually.',
+	'EXTENSION_MANAGED_WITH_ENABLE_ERROR'		=> 'The “%s” extension has been installed but an error occurred while enabling it.',
 	'EXTENSION_NOT_INSTALLED'					=> 'The “%s” extension is not installed.',
 
 	'ENABLING_EXTENSIONS'	=> 'Enabling extensions',
 	'DISABLING_EXTENSIONS'	=> 'Disabling extensions',
 
 	'EXTENSIONS_CATALOG'			=> 'Extensions Catalog',
-	'EXTENSIONS_CATALOG_EXPLAIN'	=> 'Here you can browse all of the extensions available for your phpBB board. Extensions can easily be installed or removed with just a click. Adjust the Settings to allow instant enabling and purging of extensions.',
+	'EXTENSIONS_CATALOG_EXPLAIN'	=> 'Here you can browse all of the extensions available for your phpBB board. Extensions can easily be installed or removed with just a click. Adjust the settings to allow instant enabling and purging of extensions.',
 
 	'EXTENSION'					=> 'Extension',
 	'EXTENSIONS'				=> 'Extensions',
diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php
index 3605af135b..18a66d1bf8 100644
--- a/phpBB/phpbb/composer/installer.php
+++ b/phpBB/phpbb/composer/installer.php
@@ -76,14 +76,14 @@ class installer
 	private $ext_json_file_backup;
 
 	/**
-	 * @param \phpbb\config\config	$config		Config object
-	 * @param string				$root_path	phpBB root path
+	 * @param string	$root_path	phpBB root path
+	 * @param config	$config		Config object
 	 */
 	public function __construct($root_path, config $config = null)
 	{
 		if ($config)
 		{
-			$repositories        = json_decode($config['exts_composer_repositories'], true);
+			$repositories = json_decode($config['exts_composer_repositories'], true);
 
 			if (is_array($repositories) && !empty($repositories))
 			{