diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index a1ca5cd..eb7f9ab 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -39,7 +39,7 @@ class ApplicationController < ActionController::Base
 
   def load_profile
     @profile = Profile.find_by_identifier(params[:profile])
-    raise "The profile must be loaded %s" % params.inspect if @profile.nil?
+    raise "The profile must be loaded %s" % params[:profile].to_s if @profile.nil?
   end
 
   def self.acts_as_environment_admin_controller
diff --git a/app/controllers/environment_admin/edit_template_controller.rb b/app/controllers/environment_admin/edit_template_controller.rb
index 434997b..9923d78 100644
--- a/app/controllers/environment_admin/edit_template_controller.rb
+++ b/app/controllers/environment_admin/edit_template_controller.rb
@@ -4,10 +4,9 @@ class EditTemplateController < EnvironmentAdminController
   
   def block_types
     { 
-      #'ListBlock' => _("List Block"), 
-      #'LinkBlock' => _("Link Block"),
-      #'RecentDocumentsBlock' => _('Recent documents'),
-      'Design::MainBlock' => _('Main content block'),
+      'ListBlock' => _("List Block"), 
+      'LinkBlock' => _("Link Block"),
+      'RecentDocumentsBlock' => _('Recent documents'),
     }
   end
 
--
libgit2 0.21.2