Index: /branches/release-33/lib/MT/Bootstrap.pm
===================================================================
--- /branches/release-33/lib/MT/Bootstrap.pm (revision 1174)
+++ /branches/release-33/lib/MT/Bootstrap.pm (revision 1834)
@@ -87,5 +87,5 @@
                 $charset = $app->{cfg}->PublishCharset;
             };
-            if ($app && UNIVERSAL::isa($app, 'MT::App')) {
+            if ($app && UNIVERSAL::isa($app, 'MT::App') && !UNIVERSAL::isa($app, 'MT::App::Wizard')) {
                 eval {
                     # line __LINE__ __FILE__
Index: /branches/release-33/lib/MT/Template/ContextHandlers.pm
===================================================================
--- /branches/release-33/lib/MT/Template/ContextHandlers.pm (revision 1781)
+++ /branches/release-33/lib/MT/Template/ContextHandlers.pm (revision 1834)
@@ -1110,5 +1110,8 @@
     my $rebuild = $args->{rebuild} || '';
     my $blog_id = $ctx->var('blog_id');
-    my $blog = $ctx->stash('blog') || MT->model('blog')->load($blog_id);
+    my $blog = $ctx->stash('blog');
+    if (!$blog && $blog_id) {
+        $blog = MT->model('blog')->load($blog_id);
+    }
     $rebuild = '' if $blog && $blog->custom_dynamic_templates eq 'all';
     $rebuild = qq{<__trans phrase="[_1]Publish[_2] your site to see these changes take effect." params="<a href="javascript:void(0);" class="rebuild-link" onclick="doRebuild('$blog_id');">%%</a>">} if $rebuild eq 'all';