diff --git a/src/ember/directory.js b/src/ember/directory.js
index 076c7290..d5b0e7fa 100644
--- a/src/ember/directory.js
+++ b/src/ember/directory.js
@@ -369,7 +369,7 @@ FFZ.prototype._modify_directory_live = function(dir, is_csgo) {
 						return;
 
 					e.preventDefault();
-					t.get('controller').transitionTo('channel.index', Channel.find({id: channel_id}).load());
+					utils.ember_lookup('router:main').transitionTo('channel.index', Channel.find({id: channel_id}).load());
 					return false;
 				});
 
@@ -462,7 +462,7 @@ FFZ.prototype._modify_directory_host = function(dir) {
 			}
 
 			f.close_popup();
-			this.get('controller').transitionTo('channel.index', Channel.find({id: target}).load());
+			utils.ember_lookup('router:main').transitionTo('channel.index', Channel.find({id: target}).load());
 			return false;
 		},
 
@@ -570,7 +570,7 @@ FFZ.prototype._modify_directory_host = function(dir) {
 			if ( ! boxart && thumb && this.get('context.model.game') ) {
 				var img = document.createElement('img'),
 					game = this.get("context.model.game"),
-					c = this.get('controller');
+					c = utils.ember_lookup('router:main');
 
 				boxart = document.createElement('a');
 				boxart.className = 'boxart';
@@ -589,7 +589,7 @@ FFZ.prototype._modify_directory_host = function(dir) {
 					else if ( game === "Creative" )
 						c.transitionTo('creative.channels.index');
 					else
-						c.transitionTo('gameDirectory.index', encodeURIComponent(game));
+						c.transitionTo('game-directory.index', encodeURIComponent(game));
 
 					return false;
 				});
diff --git a/src/ember/line.js b/src/ember/line.js
index 6d86543e..80be560a 100644
--- a/src/ember/line.js
+++ b/src/ember/line.js
@@ -834,6 +834,9 @@ FFZ.prototype._modify_chat_line = function(component, is_vod) {
             var el = this.get('element'),
                 output = this.buildSenderHTML();
 
+            if ( el.tagName === 'DIV' )
+                return this.rerender();
+
             if ( this.get('msgObject.deleted') )
                 output += this.buildDeletedMessageHTML()
             else