diff --git a/lib/merb-core/bootloader.rb b/lib/merb-core/bootloader.rb
index <HASH>..<HASH> 100644
--- a/lib/merb-core/bootloader.rb
+++ b/lib/merb-core/bootloader.rb
@@ -124,9 +124,8 @@ end
 
 class Merb::BootLoader::DropPidFile <  Merb::BootLoader
   class << self
-    
     def run
-      Merb::Server.store_pid(Merb::Config[:port])
+      Merb::Server.store_pid(Merb::Config[:port]) unless Merb::Config[:daemonize] || Merb::Config[:cluster]
     end
   end
 end
diff --git a/lib/merb-core/logger.rb b/lib/merb-core/logger.rb
index <HASH>..<HASH> 100644
--- a/lib/merb-core/logger.rb
+++ b/lib/merb-core/logger.rb
@@ -196,7 +196,7 @@ module Merb
 
       # DOC
       def #{name}(message = nil, &block)
-        self.<<(message, &block) if #{name}?
+        self.<<(message, &block) if #{number} >= level
       end
 
       # DOC
Do not drop PID file is not running as daemon or cluster

Avoid extra method call in logging