diff --git a/src/ember/directory.js b/src/ember/directory.js
index e061aab9..076c7290 100644
--- a/src/ember/directory.js
+++ b/src/ember/directory.js
@@ -432,11 +432,11 @@ FFZ.prototype._modify_directory_host = function(dir) {
 	dir.reopen({
 		didInsertElement: function() {
 			this._super();
-			try {
+			//try {
 				this.ffzInit();
-			} catch(err) {
-				f.error("directory/host ffzInit: " + err);
-			}
+			//} catch(err) {
+				//f.error("directory/host ffzInit: " + err);
+			//}
 		},
 
 		willClearRender: function() {
@@ -626,7 +626,7 @@ FFZ.prototype._modify_directory_host = function(dir) {
 
 				if ( hosts && hosts.length > 1 ) {
 					title.textContent = utils.number_commas(hosts.length) + ' hosting ' + utils.sanitize(target.display_name);
-					title.title = _.sortBy(hosts, "name").mapProperty("display_name").join(", ");
+					title.title = _.sortBy(hosts, "name").mapBy("display_name").join(", ");
 					jQuery(title).tipsy({gravity: 's'});
 				}
 			}
diff --git a/src/ember/viewers.js b/src/ember/viewers.js
index 0a779749..11d3a140 100644
--- a/src/ember/viewers.js
+++ b/src/ember/viewers.js
@@ -22,7 +22,7 @@ FFZ.settings_info.sort_viewers = {
 
 FFZ.prototype.setup_viewers = function() {
 	this.log("Hooking the Ember Viewers controller.");
-	var Viewers = utils.ember_lookup('controller:viewers');
+	var Viewers = utils.ember_resolve('controller:viewers');
 	if ( Viewers )
 		this._modify_viewers(Viewers);
 
@@ -61,11 +61,11 @@ FFZ.prototype._modify_viewers = function(controller) {
 				// Get the broadcaster name.
 				var Channel = utils.ember_lookup('controller:channel'),
 					room_id = this.get('parentController.model.id'),
-					broadcaster = Channel && Channel.get('id');
+					broadcaster = Channel && Channel.get('model.id');
 
 				// We can get capitalization for the broadcaster from the channel.
 				if ( broadcaster ) {
-					var display_name = Channel.get('display_name');
+					var display_name = Channel.get('model.display_name');
 					if ( display_name )
 						FFZ.capitalization[broadcaster] = [display_name, Date.now()];
 				}
diff --git a/src/main.js b/src/main.js
index d64e86c1..1dd10009 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,7 +35,7 @@ FFZ.msg_commands = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 135,
+	major: 3, minor: 5, revision: 136,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}