diff --git a/public/components/ui/alerts/alerts.js b/public/components/ui/alerts/alerts.js
index 39eb37e8..90baa369 100644
--- a/public/components/ui/alerts/alerts.js
+++ b/public/components/ui/alerts/alerts.js
@@ -1,4 +1,4 @@
-import Kefir from 'kefir';
+import Kefir from 'can-kefir';
 import canStream from 'can-stream-kefir';
 import canDefineStreamKefir from 'can-define-stream-kefir';
 import Component from 'can-component';
@@ -35,7 +35,6 @@ const ViewModel = DefineMap.extend({
         .merge(this.autoHideStream)
         .merge(this.stream('remove'))
         .scan((alerts, ev) => {
-            console.log("GOt event", ev.type);
           switch (ev.type) {
             case 'alert':
               return [ev, ...alerts.slice()];
diff --git a/public/components/ui/alerts/alerts.stache b/public/components/ui/alerts/alerts.stache
index 3cfa6b0d..b2e8b01f 100644
--- a/public/components/ui/alerts/alerts.stache
+++ b/public/components/ui/alerts/alerts.stache
@@ -2,11 +2,11 @@
 <div class="alert-container">
 	{{# each(alerts) }}
 	<div class="alert alert-dismissable alert-{{ kind }}">
-	    <button type="button" class="close" on:click="removeAlert(.)">
+	    <button type="button" class="close" on:click="../removeAlert(.)">
 	    	<span aria-hidden="true">&times;</span>
 	    </button>
 	    {{# title }}<h3 class="title">{{ . }}</h3>{{/ title }}
-	    {{# message }}<div class="message">{{ {. }}}</div>{{/ message }}
+	    {{# message }}<div class="message">{{{ . }}}</div>{{/ message }}
 	</div>
 	{{/ each }}
 </div>
diff --git a/public/package.json b/public/package.json
index 0c4a1e1c..dddc677a 100644
--- a/public/package.json
+++ b/public/package.json
@@ -62,6 +62,7 @@
     "can-define-stream-kefir": "^1.0.0",
     "can-event-dom-enter": "^2.1.2",
     "can-event-queue": "^1.0.2",
+    "can-kefir": "^1.1.0",
     "can-observation": "^4.0.1",
     "can-query-logic": "<2.0.0",
     "can-queues": "^1.1.0",
@@ -91,7 +92,6 @@
     "feathers-socketio": "1.4.2",
     "jquery": "^2.1.4",
     "jwt-decode": "^2.1.0",
-    "kefir": "^3.6.1",
     "moment": "^2.17.0",
     "steal": "^1.12.1",
     "steal-css": "^1.0.0",