diff --git a/app/assets/javascripts/supplier/app/components/section/tab-header.js.coffee b/app/assets/javascripts/supplier/app/components/section/tab-header.js.coffee
index 86f50d23..14cb5196 100644
--- a/app/assets/javascripts/supplier/app/components/section/tab-header.js.coffee
+++ b/app/assets/javascripts/supplier/app/components/section/tab-header.js.coffee
@@ -1,4 +1,4 @@
-App.SectionTabHeaderComponent= Ember.Component.extend DragNDrop.Droppable,
+App.SectionTabHeaderComponent= Ember.Component.extend
   layoutName: 'section/tab-header'
   classNameBindings: ['section_header_class', 'section_active:active']
   classNames: ['section-tab-header']
diff --git a/app/assets/javascripts/supplier/app/mixins/drag_n_drop.js.coffee b/app/assets/javascripts/supplier/app/mixins/drag_n_drop.js.coffee
index 8b648525..0153a60c 100644
--- a/app/assets/javascripts/supplier/app/mixins/drag_n_drop.js.coffee
+++ b/app/assets/javascripts/supplier/app/mixins/drag_n_drop.js.coffee
@@ -29,13 +29,13 @@ DragNDrop.Draggable = Ember.Mixin.create
   touchStart: (ev)->
     ev.preventDefault()
     target = @$()
-    return unless target.prop 'draggable'
     touch = ev.originalEvent.changedTouches[0]
     @touchStartEvent =
       left: parseFloat(target.css('left'))
       top: parseFloat(target.css('top'))
       pageX: touch.pageX
       pageY: touch.pageY
+    return unless target.prop 'draggable'
 
   touchMove: (ev)->
     ev.preventDefault()
diff --git a/config/environments/development.rb b/config/environments/development.rb
index e944aa06..ed0dbf54 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,27 +16,17 @@ Qwaiter::Application.configure do
 
   config.ember.variant = :development
 
-  config.action_controller.asset_host = "http://localhost:3000"
+  config.action_controller.asset_host = "http://#{ENV['MOZO_LOCAL_IP'] || 'localhost'}:3000"
   # config.web_console.automount = true
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
   config.action_mailer.delivery_method = :letter_opener
   config.action_mailer.default_url_options = {
-    host: 'localhost',
+    host: ENV['MOZO_LOCAL_IP'] || 'localhost',
     port: 3000
   }
 
-  config.action_mailer.smtp_settings = {
-    address: "smtp.gmail.com",
-    port: 587,
-    domain: "atool.nl",
-    authentication: :plain,
-    user_name: "bterkuile@companytools.nl",
-    password: "BjTKct22",
-    enable_starttls_auto: true
-  }
-
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 
diff --git a/config/initializers/mozo_settings.rb b/config/initializers/mozo_settings.rb
index ad9b4b26..fda87bb2 100644
--- a/config/initializers/mozo_settings.rb
+++ b/config/initializers/mozo_settings.rb
@@ -1,4 +1,4 @@
-Qwaiter.event_host = "http://#{(Rails.env.development? or Rails.env.test?) ? 'localhost' : 'events.mozo.bar'}:9296/faye"
+Qwaiter.event_host = "http://#{(Rails.env.development? or Rails.env.test?) ? ENV['MOZO_LOCAL_IP'] || 'localhost' : 'events.mozo.bar'}:9296/faye"
 Qwaiter.broadcaster = Qwaiter::Broadcaster::Faye.new
 
 # use the connection from couchbase-structures/documents