diff --git a/Gemfile b/Gemfile
index b6b1d0fd..c3dcd79e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,9 +9,10 @@ gem 'rails', '>= 3.0.7'
 gem 'warden'
 gem 'devise', '= 1.1.3'
 
-gem 'mongoid', '~> 2.0.1'
+gem 'mongoid', '~> 2.0.2'
 gem 'bson_ext', '~> 1.3.0'
-gem 'locomotive_mongoid_acts_as_tree', '0.1.5.5', :require => 'mongoid_acts_as_tree'
+gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree'
+# gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree', :path => '../gems/acts_as_tree'
 gem 'will_paginate'
 
 gem 'haml', '3.0.25'
@@ -22,7 +23,8 @@ gem 'inherited_resources', '~> 1.1.2'
 gem 'rmagick', '2.12.2'
 gem 'locomotive_carrierwave', '0.5.0.1.beta3', :require => 'carrierwave'
 
-gem 'custom_fields', '1.0.0.beta.13'
+gem 'custom_fields', '1.0.0.beta.15'
+# gem 'custom_fields', '1.0.0.beta.15', :path => '../gems/custom_fields'
 gem 'fog', '0.3.7'
 gem 'mimetype-fu'
 gem 'actionmailer-with-request', :require => 'actionmailer_with_request'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1d1d894a..f588a42a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -93,10 +93,10 @@ GEM
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
     culerity (0.2.15)
-    custom_fields (1.0.0.beta.13)
+    custom_fields (1.0.0.beta.15)
       activesupport (>= 3.0.7)
       locomotive_carrierwave
-      mongoid (~> 2.0.1)
+      mongoid (= 2.0.2)
     daemons (1.1.3)
     database_cleaner (0.6.7)
     delayed_job (2.1.4)
@@ -139,7 +139,7 @@ GEM
     heroku (1.19.1)
       activesupport (>= 2.1.0)
       launchy (~> 0.3.2)
-      rest-client (>= 1.4.0, < 1.7.0)
+      rest-client (< 1.7.0, >= 1.4.0)
     highline (1.6.2)
     httparty (0.7.7)
       crack (= 0.1.8)
@@ -165,8 +165,8 @@ GEM
       mimemagic (>= 0.1.7)
       s3 (>= 0.3.7)
     locomotive_liquid (2.2.2)
-    locomotive_mongoid_acts_as_tree (0.1.5.5)
-      mongoid (~> 2.0.0.rc.7)
+    locomotive_mongoid_acts_as_tree (0.1.5.7)
+      mongoid (= 2.0.2)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -244,7 +244,7 @@ GEM
     rubyzip (0.9.4)
     s3 (0.3.8)
       proxies (~> 0.2.0)
-    selenium-webdriver (0.2.0)
+    selenium-webdriver (0.2.1)
       childprocess (>= 0.1.7)
       ffi (>= 1.0.7)
       json_pure
@@ -280,7 +280,7 @@ DEPENDENCIES
   capybara
   cucumber (= 0.8.5)
   cucumber-rails
-  custom_fields (= 1.0.0.beta.13)
+  custom_fields (= 1.0.0.beta.15)
   database_cleaner
   delayed_job (= 2.1.4)
   delayed_job_mongoid (= 1.0.2)
@@ -297,10 +297,10 @@ DEPENDENCIES
   locomotive_carrierwave (= 0.5.0.1.beta3)
   locomotive_jammit-s3
   locomotive_liquid (= 2.2.2)
-  locomotive_mongoid_acts_as_tree (= 0.1.5.5)
+  locomotive_mongoid_acts_as_tree (= 0.1.5.7)
   mimetype-fu
   mocha!
-  mongoid (~> 2.0.1)
+  mongoid (~> 2.0.2)
   pickle
   rails (>= 3.0.7)
   rake (= 0.8.7)
diff --git a/README.textile b/README.textile
index 746b827b..2106587e 100644
--- a/README.textile
+++ b/README.textile
@@ -20,7 +20,7 @@ h2. Gems
 Here is a short list of main gems used in the application.
 
 * Rails 3.0.7
-* Mongoid 2.0.1 (with MongoDB 1.6)
+* Mongoid 2.0.2 (with MongoDB 1.6)
 * Liquid
 * Devise
 * Carrierwave
diff --git a/app/helpers/admin/content_types_helper.rb b/app/helpers/admin/content_types_helper.rb
index b9d7fca0..8131876b 100644
--- a/app/helpers/admin/content_types_helper.rb
+++ b/app/helpers/admin/content_types_helper.rb
@@ -68,7 +68,7 @@ module Admin::ContentTypesHelper
   end
 
   def content_label_for(content)
-    if content._parent.item_template.nil?
+    if content._parent.raw_item_template.blank?
       content._label # default one
     else
       assigns = {
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index 9d990ceb..8d9cecab 100644
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", ">= 3.0.7"
   s.add_dependency "warden"
   s.add_dependency "devise", "1.1.3"
-  s.add_dependency "mongoid", "2.0.1"
+  s.add_dependency "mongoid", "2.0.2"
   s.add_dependency "bson_ext", "~> 1.3.0"
-  s.add_dependency "locomotive_mongoid_acts_as_tree", "0.1.5.5"
+  s.add_dependency "locomotive_mongoid_acts_as_tree", "0.1.5.7"
   s.add_dependency "will_paginate"
 
   s.add_dependency "haml", "3.0.25"
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rmagick", "2.12.2"
   s.add_dependency "locomotive_carrierwave", "0.5.0.1.beta3"
 
-  s.add_dependency "custom_fields", "1.0.0.beta.13"
+  s.add_dependency "custom_fields", "1.0.0.beta.15"
   s.add_dependency "fog", "0.3.7"
   s.add_dependency "mimetype-fu"
   s.add_dependency "actionmailer-with-request"