diff --git a/Gemfile b/Gemfile
index 6a7ec9eef..16a6071f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem "rails"
 gem "bundler"
 
 gem "mongoid"
-gem "delayed_job_mongoid"
+gem "delayed_job_mongoid" # <= Problematic dep upgrade
 gem "delayed_job_shallow_mongoid"
 gem "kaminari-mongoid"
 gem "mongoid_taggable"
@@ -52,7 +52,7 @@ source "https://rails-assets.org" do
   gem "rails-assets-angular-typeahead", "~> 0.3"
   gem "rails-assets-ng-tags-input", "~> 2.0"
   gem "rails-assets-ng-file-upload", "~> 12.2"
-  gem "rails-assets-moment", "~> 2.3"
+  gem "rails-assets-moment", "2.8.4"
   gem "rails-assets-showdown", "~> 0.5"
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ea795ff4..60b35699a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -364,7 +364,7 @@ GEM
     rails-assets-jquery (2.2.4)
     rails-assets-jquery-ui (1.12.1)
       rails-assets-jquery (>= 1.6)
-    rails-assets-moment (2.22.2)
+    rails-assets-moment (2.8.4)
     rails-assets-ng-file-upload (12.2.13)
       rails-assets-angular (> 1.2.0)
     rails-assets-ng-tags-input (2.3.0)
@@ -562,7 +562,7 @@ DEPENDENCIES
   rails-assets-angular-ui-sortable (~> 0.13)!
   rails-assets-jquery (~> 2.1)!
   rails-assets-jquery-ui (~> 1.11)!
-  rails-assets-moment (~> 2.3)!
+  rails-assets-moment (= 2.8.4)!
   rails-assets-ng-file-upload (~> 12.2)!
   rails-assets-ng-tags-input (~> 2.0)!
   rails-assets-showdown (~> 0.5)!
diff --git a/config/environments/production.rb b/config/environments/production.rb
index aaea0d62f..684a76b2e 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -7,7 +7,7 @@
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
   config.serve_static_files = false
-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = Uglifier.new(harmony: true)
   config.assets.compile = true
   config.assets.digest = true
   config.assets.version = '1.0'
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 232b4ab98..9acbba576 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -10,7 +10,7 @@
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
   config.serve_static_files = false
-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = Uglifier.new(harmony: true)
   config.assets.compile = true
   config.assets.digest = true
   config.assets.version = '1.0'