diff --git a/core/main/handlers/browserdetails.rb b/core/main/handlers/browserdetails.rb
index 17f5d5a5b..d9592ccb2 100644
--- a/core/main/handlers/browserdetails.rb
+++ b/core/main/handlers/browserdetails.rb
@@ -30,7 +30,7 @@ module BeEF
           # validate hook session value
           session_id = get_param(@data, 'beefhook')
           (self.err_msg "session id is invalid"; return) if not BeEF::Filters.is_valid_hook_session_id?(session_id)
-          hooked_browser = HB.first(:session => session_id)
+          hooked_browser = HB.where(:session => session_id).first
           return if not hooked_browser.nil? # browser is already registered with framework
 
           # create the structure representing the hooked browser
@@ -73,7 +73,7 @@ module BeEF
             @http_headers[key.sub(/^HTTP_/, '')] = value.force_encoding('UTF-8')
           }
           zombie.httpheaders = @http_headers.to_json
-          zombie.save
+          zombie.save!
           #print_debug "[INIT] HTTP Headers: #{zombie.httpheaders}"
 
           # add a log entry for the newly hooked browser
@@ -211,7 +211,7 @@ module BeEF
               if config.get("beef.extension.network.enable") == true
                 if proxy_server =~ /^([\d\.]+):([\d]+)$/
                   print_debug("Hooked browser [id:#{zombie.id}] is using a proxy [ip: #{$1}]")
-                  BeEF::Core::Models::NetworkHost.add(:hooked_browser_id => session_id, :ip => $1, :type => 'Proxy')
+                  BeEF::Core::Models::NetworkHost.create(:hooked_browser_id => session_id, :ip => $1, :type => 'Proxy')
                 end
               end
             end
@@ -504,7 +504,7 @@ module BeEF
           # add localhost as network host
           if config.get('beef.extension.network.enable')
             print_debug("Hooked browser has network interface 127.0.0.1")
-            BeEF::Core::Models::NetworkHost.add(:hooked_browser_id => session_id, :ip => '127.0.0.1', :hostname => 'localhost', :os => BeEF::Core::Models::BrowserDetails.get(session_id, 'host.os.name'))
+            BeEF::Core::Models::NetworkHost.create(:hooked_browser_id => session_id, :ip => '127.0.0.1', :hostname => 'localhost', :os => BeEF::Core::Models::BrowserDetails.get(session_id, 'host.os.name'))
           end
 
           # check if any ARE rules shall be triggered only if the channel is != WebSockets (XHR). If the channel
diff --git a/core/main/handlers/modules/command.rb b/core/main/handlers/modules/command.rb
index 48e873887..9409de26e 100644
--- a/core/main/handlers/modules/command.rb
+++ b/core/main/handlers/modules/command.rb
@@ -21,7 +21,7 @@ module BeEF
 
             config = BeEF::Core::Configuration.instance
             # @note get the command module
-            command_module = BeEF::Core::Models::CommandModule.first(:id => command.command_module_id)
+            command_module = BeEF::Core::Models::CommandModule.where(:id => command.command_module_id).first
             (print_error "command_module is nil"; return) if command_module.nil?
             (print_error "command_module.path is nil"; return) if command_module.path.nil?
 
@@ -70,7 +70,7 @@ module BeEF
 
             # @note flag that the command has been sent to the hooked browser
             command.instructions_sent = true
-            command.save
+            command.save!
           end
 
         end