diff --git a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
index b79a5db670..42d5664c43 100644
--- a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
+++ b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php
@@ -543,7 +543,7 @@ public function jetpack_stats() {
 	 * and script loader.
 	 */
 	public function show_admin_bar() {
-		add_action( 'gp_head', 'wp_admin_bar_header' );
+		add_action( 'gp_head', 'wp_enqueue_admin_bar_header_styles' );
 		add_action( 'gp_head', '_admin_bar_bump_cb' );
 
 		gp_enqueue_script( 'admin-bar' );
diff --git a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/header.php b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/header.php
index 874b30d9af..aad1a2e17d 100644
--- a/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/header.php
+++ b/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/header.php
@@ -22,10 +22,12 @@
 			<nav id="site-navigation" class="navigation-main clear" role="navigation">
 				<button type="button" class="menu-toggle dashicons dashicons-arrow-down-alt2"></button>
 				<?php
-				wp_nav_menu( [
-					'theme_location' => 'wporg_header_subsite_nav',
-					'fallback_cb' => false,
-				] );
+				wp_nav_menu(
+					array(
+						'theme_location' => 'wporg_header_subsite_nav',
+						'fallback_cb'    => false,
+					)
+				);
 				?>
 			</nav>
 		<?php endif; ?>
diff --git a/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-index.php b/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-index.php
index 330cff8592..53091fabb5 100644
--- a/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-index.php
+++ b/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-index.php
@@ -19,10 +19,7 @@ class Index extends GP_Route {
 	public function get_locales() {
 		$existing_locales = Plugin::get_existing_locales();
 
-		$locales = array();
-		foreach ( $existing_locales as $locale ) {
-			$locales[] = GP_Locales::by_slug( $locale );
-		}
+		$locales = array_filter( array_map( array( 'GP_Locales', 'by_slug' ), Plugin::get_existing_locales() ) );
 		usort( $locales, array( $this, '_sort_english_name_callback' ) );
 		unset( $existing_locales );
 
@@ -33,6 +30,6 @@ public function get_locales() {
 	}
 
 	private function _sort_english_name_callback( $a, $b ) {
-		return $a->english_name > $b->english_name;
+		return $a->english_name <=> $b->english_name;
 	}
 }