diff --git a/app/models/site.rb b/app/models/site.rb
index dcd39942..7873c6d5 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -12,11 +12,11 @@ class Site
   field :meta_description
 
   ## associations ##
-  references_many :pages
-  references_many :snippets, :dependent => :destroy
-  references_many :theme_assets, :dependent => :destroy
-  references_many :asset_collections, :dependent => :destroy
-  references_many :content_types, :dependent => :destroy
+  references_many :pages, :validate => false
+  references_many :snippets, :dependent => :destroy, :validate => false
+  references_many :theme_assets, :dependent => :destroy, :validate => false
+  references_many :asset_collections, :dependent => :destroy, :validate => false
+  references_many :content_types, :dependent => :destroy, :validate => false
   embeds_many :memberships
 
   ## validations ##
diff --git a/lib/locomotive/hosting/heroku/custom_domain.rb b/lib/locomotive/hosting/heroku/custom_domain.rb
index 2dbbd685..1370ef3f 100644
--- a/lib/locomotive/hosting/heroku/custom_domain.rb
+++ b/lib/locomotive/hosting/heroku/custom_domain.rb
@@ -18,10 +18,12 @@ module Locomotive
 
           def add_subdomain_to_domains_with_heroku
             unless self.domains_change.nil?
+              old_full_subdomain = "#{self.subdomain_was}.#{Locomotive.config.domain}"
               full_subdomain = "#{self.subdomain}.#{Locomotive.config.domain}"
+
               @heroku_domains_change = {
-                :added    => self.domains_change.last - self.domains_change.first - [full_subdomain],
-                :removed  => self.domains_change.first - self.domains_change.last - [full_subdomain]
+                :added    => self.domains_change.last - self.domains_change.first - [old_full_subdomain] - [full_subdomain],
+                :removed  => self.domains_change.first - self.domains_change.last - [old_full_subdomain] - [full_subdomain]
               }
             end