diff --git a/lib/dir_init.rb b/lib/dir_init.rb
--- a/lib/dir_init.rb
+++ b/lib/dir_init.rb
@@ -25,7 +25,7 @@
     # Check if someone has initialized the dir.  If not, call block.
 
     def setup    # :yields: block
-      dir = File.new(@dir_name)
+      dir = File.new(@dir_name + '/lockfile',"w+")
       dir.flock(File::LOCK_EX)
       begin
         counter_filename = get_counter_filename
diff --git a/lib/engine.rb b/lib/engine.rb
--- a/lib/engine.rb
+++ b/lib/engine.rb
@@ -136,6 +136,7 @@
 
       scripts.each do |s|
         fname = File.basename(s)
+        next if FileTest.directory?(s)
         if !FileTest.exist?("#{script_dir}/#{fname}")
           copied << fname
           FileUtils.cp(s, "#{script_dir}")
diff --git a/lib/test_request_helper.rb b/lib/test_request_helper.rb
--- a/lib/test_request_helper.rb
+++ b/lib/test_request_helper.rb
@@ -8,7 +8,7 @@
   def self.link_or_copy(src, des)
     begin
       FileUtils.ln_s(src, des)
-    rescue
+    rescue NotImplementedError
       FileUtils.cp(src,des)
     end
   end
diff --git a/std-script/.gitignore b/std-script/.gitignore
--- a/std-script/.gitignore
+++ b/std-script/.gitignore
@@ -1,2 +1,2 @@
 box
-
+box.exe