diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index dfc8cde96a..0ebbc67af9 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -1,3 +1,4 @@
+/* global _wpMediaViewsL10n, setUserSetting, deleteUserSetting, MediaElementPlayer */
 (function($, _, Backbone, wp) {
 	var media = wp.media, l10n;
 
@@ -94,7 +95,7 @@
 		_content: function() {
 			var mode = this.get( 'content' );
 			if ( mode ) {
-				this.frame[ 'content' ].render( mode );
+				this.frame.content.render( mode );
 			}
 		}
 	});
@@ -218,13 +219,13 @@
 
 		editPreviousAttachment: function( currentModel ) {
 			var library = this.state().get('library'),
-			    currentModelIndex = library.indexOf( currentModel );
+				currentModelIndex = library.indexOf( currentModel );
 			this.trigger( 'edit:attachment', library.at( currentModelIndex - 1 ) );
 		},
 
 		editNextAttachment: function( currentModel ) {
 			var library = this.state().get('library'),
-			    currentModelIndex = library.indexOf( currentModel );
+				currentModelIndex = library.indexOf( currentModel );
 			this.trigger( 'edit:attachment', library.at( currentModelIndex + 1 ) );
 		},
 
@@ -342,7 +343,7 @@
 			'click .right':             'nextMediaItem'
 		},
 
-		initialize: function( options ) {
+		initialize: function() {
 			var self = this;
 			media.view.Frame.prototype.initialize.apply( this, arguments );
 
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 73e2fabb4e..098a03a543 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -235,7 +235,7 @@ function wp_print_media_templates() {
 			<input type="checkbox" data-setting="title" {{ '' === getUserSetting( 'hidegridtitle' ) && 'checked' }} />
 		</label>
 		<label class="setting">
-			<span><?php _e( 'Attached to' ); ?></span>
+			<span><?php _e( 'Uploaded to' ); ?></span>
 			<input type="checkbox" data-setting="uploadedTo" {{ '' === getUserSetting( 'hidegriduploadedTo' ) && 'checked' }} />
 		</label>
 		<label class="setting">