diff --git a/addon/adapters/application.coffee b/addon/adapters/application.coffee
index e0eefb8..1901f01 100644
--- a/addon/adapters/application.coffee
+++ b/addon/adapters/application.coffee
@@ -2,15 +2,17 @@ import Ember from 'ember'
 import DS from 'ember-data'
 import { pluralize } from 'ember-inflector'
 import config from 'ember-get-config'
-import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin'
+#import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin'
+
+export default DS.JSONAPIAdapter.extend #DataAdapterMixin,
+  session: Ember.inject.service()
 
-export default DS.JSONAPIAdapter.extend DataAdapterMixin,
   namespace:  config.apiNamespace
   host:       config.apiHost
   authorizer: 'authorizer:devise'
-  headers: Ember.computed 'session.data.authenticated.access_token', ->
+  headers: Ember.computed 'session.{data.authenticated.access_token,isAuthenticated}', ->
     headers = {}
-    headers['Authorization'] = "Bearer #{@session.data.authenticated.token}" if @session.isAuthenticated
+    headers['Authorization'] = "Bearer #{@get('session.data.authenticated.token')}" if @get('session.isAuthenticated')
     headers
   #pathForType: (type)->
   #  type.underscore().pluralize()
diff --git a/addon/components/ui-calendar-moment.coffee b/addon/components/ui-calendar-moment.coffee
index 038c7df..d0645fa 100644
--- a/addon/components/ui-calendar-moment.coffee
+++ b/addon/components/ui-calendar-moment.coffee
@@ -1,5 +1,6 @@
 import Ember from 'ember'
-import UiCalendarComponent from 'fomantic-ui-ember/components/ui-calendar'
+#import UiCalendarComponent from 'fomantic-ui-ember/components/ui-calendar'
+import UiCalendarComponent from 'ember-semantic-ui-calendar/components/ui-calendar'
 { computed, inject, merge } = Ember
 export default UiCalendarComponent.extend
   momentValue: null
diff --git a/addon/mixins/application-route.coffee b/addon/mixins/application-route.coffee
index 084b159..8b15444 100644
--- a/addon/mixins/application-route.coffee
+++ b/addon/mixins/application-route.coffee
@@ -2,9 +2,11 @@ import Ember from 'ember'
 import config from 'ember-get-config'
 import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin'
 
-export default Ember.Mixin.create ApplicationRouteMixin,
+route_mixin = Ember.Mixin.create ApplicationRouteMixin,
   current_user_loaded: (user) -> @get('initial_resources_resolve')(user)
   router: Ember.inject.service()
+  globals: Ember.inject.service()
+
   beforeModel: (transition) ->
     @set 'globals.initial_resources_fulfilled', false
     time_now = new Date()
@@ -38,6 +40,7 @@ export default Ember.Mixin.create ApplicationRouteMixin,
       @current_user_loaded user # overloadable
     , =>
       @set 'globals.current_user', null
+      @get('session').invalidate()
       @get('initial_resources_resolve')() # no initial resources without user, do not halt application propagation (login page)
       @transitionTo('login')
 
@@ -208,3 +211,5 @@ export default Ember.Mixin.create ApplicationRouteMixin,
     reload: (target) ->
       target?.reload?()
       false
+
+export default route_mixin
diff --git a/addon/mixins/modal-base.coffee b/addon/mixins/modal-base.coffee
index 5941809..1e15f92 100644
--- a/addon/mixins/modal-base.coffee
+++ b/addon/mixins/modal-base.coffee
@@ -1,5 +1,7 @@
 import Ember from 'ember'
 export default Ember.Component.extend
+  store: Ember.inject.service()
+
   alert_message: ""
   modal_options: {}
   layoutName: 'modals/layout'
diff --git a/addon/overrides/model.coffee b/addon/overrides/model.coffee
index 9826dae..f5c1d1f 100644
--- a/addon/overrides/model.coffee
+++ b/addon/overrides/model.coffee
@@ -1,4 +1,10 @@
 import DS from 'ember-data'
+
+DS.Model.reopenClass
+  typeForRelationship: (name, store) ->
+    return unless store
+    @_super(name, store)
+
 export default DS.Model.reopen
   toJSON: (options = {}) ->
     #serializer = @_internalModel.store.serializerFor('-default')