diff --git a/js/forum/src/components/terminal-post.js b/js/forum/src/components/terminal-post.js
index 7897f2e8d..494f75c40 100644
--- a/js/forum/src/components/terminal-post.js
+++ b/js/forum/src/components/terminal-post.js
@@ -15,7 +15,7 @@ export default class TerminalPost extends Component {
     var discussion = this.props.discussion;
     var lastPost = this.props.lastPost && discussion.repliesCount();
 
-    return m('li', [
+    return m('span', [
       m('span.username', discussion[lastPost ? 'lastUser' : 'startUser']().username()),
       lastPost ? ' replied ' : ' started ',
       m('time', humanTime(discussion[lastPost ? 'lastTime' : 'startTime']()))
diff --git a/js/lib/components/nav-item.js b/js/lib/components/nav-item.js
index c070ef2c7..617571bd5 100644
--- a/js/lib/components/nav-item.js
+++ b/js/lib/components/nav-item.js
@@ -3,11 +3,11 @@ import icon from 'flarum/helpers/icon'
 
 export default class NavItem extends Component {
   view() {
-    var active = NavItem.active(this.props);
+    var active = this.constructor.active(this.props);
     return m('li'+(active ? '.active' : ''), m('a', {href: this.props.href, config: m.route}, [
       icon(this.props.icon+' icon'),
       this.props.label, ' ',
-      m('span.count', this.props.badge)
+      this.props.badge ? m('span.count', this.props.badge) : ''
     ]))
   }