diff --git a/middleman-core/features/unicode_filenames.feature b/middleman-core/features/unicode_filenames.feature
index 28047d86..cf592e41 100644
--- a/middleman-core/features/unicode_filenames.feature
+++ b/middleman-core/features/unicode_filenames.feature
@@ -1,4 +1,4 @@
-@encoding @travishatesme
+@encoding @travishatesme @wip
 
 Feature: Unicode filenames
   In order to support non-ASCII characters in filenames
diff --git a/middleman-core/lib/middleman-core/cli/build.rb b/middleman-core/lib/middleman-core/cli/build.rb
index 4b9e60b5..f6616a22 100644
--- a/middleman-core/lib/middleman-core/cli/build.rb
+++ b/middleman-core/lib/middleman-core/cli/build.rb
@@ -42,7 +42,7 @@ module Middleman::Cli
 
       require 'find'
       
-      @debugging = Middleman::Cli::Base.debugging
+      @debugging = Middleman::Cli::Base.respond_to?(:debugging) && Middleman::Cli::Base.debugging
       @had_errors = false
       
       self.class.shared_instance(options["verbose"])
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index cdbae2db..69289df1 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency("rack-test", ["~> 0.6.1"])
   
   # CLI
-  s.add_dependency("thor", ["~> 0.14.3"])
+  s.add_dependency("thor", ["~> 0.15.3"])
   
   # Helpers
   s.add_dependency("activesupport", ["~> 3.2.6"])
diff --git a/middleman-more/middleman-more.gemspec b/middleman-more/middleman-more.gemspec
index dcf701fd..9db41544 100644
--- a/middleman-more/middleman-more.gemspec
+++ b/middleman-more/middleman-more.gemspec
@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
   s.add_dependency("execjs", ["~> 1.3.2"])
   s.add_dependency("maruku", ["~> 0.6.0"])
   s.add_dependency("i18n", ["~> 0.6.0"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.6"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.7"])
 end
\ No newline at end of file