diff --git a/bin/mm-server b/bin/mm-server
index 267548b6..c1fb7134 100755
--- a/bin/mm-server
+++ b/bin/mm-server
@@ -5,7 +5,7 @@ trap("TSTP") do
   fork do
     require "open3"
     first_run = true
-    Open3.popen3(%Q{cd "#{Dir.pwd}" && mm-build | grep FORCED}) do |stdin, stdout, stderr|
+    Open3.popen3(%Q{cd "#{Dir.pwd}" && #{File.join(File.dirname(__FILE__), "mm-build")} | grep FORCED}) do |stdin, stdout, stderr|
       puts "\n== Building the site..."
       stdout.readlines.each do |l|
         puts "== Updated:" if first_run
diff --git a/lib/middleman/builder.rb b/lib/middleman/builder.rb
index 6b05d8c4..c6583ff2 100644
--- a/lib/middleman/builder.rb
+++ b/lib/middleman/builder.rb
@@ -29,8 +29,7 @@ module Middleman
 
     def self.file(name, *args, &block)
       if (args[0] === args[1])
-        args[1] = args[0].gsub("#{File.basename(Middleman::Base.views)}/", "")
-                         .gsub("#{File.basename(Middleman::Base.public)}/", "")
+        args[1] = args[0].gsub("#{File.basename(Middleman::Base.views)}/", "").gsub("#{File.basename(Middleman::Base.public)}/", "")
       end
       super(name, *args, &block)
     end