diff --git a/src/vnm_mad/remotes/fw/clean b/src/vnm_mad/remotes/fw/clean
index 5308c108f6..9d8c1b1aac 100755
--- a/src/vnm_mad/remotes/fw/clean
+++ b/src/vnm_mad/remotes/fw/clean
@@ -16,8 +16,8 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-$: << File.dirname(__FILE__)
-$: << File.join(File.dirname(__FILE__), "..")
+$LOAD_PATH << File.dirname(__FILE__)
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..')
 
 require 'vnmmad'
 
@@ -33,7 +33,7 @@ begin
                                                     xpath_filter,
                                                     deploy_id)
     filter_driver.run_hooks(ARGV, template64) if filter_driver.deactivate == 0
-rescue StandardError
+rescue StandardError => e
     OpenNebula.log_error(e.message)
     OpenNebula.log_error(e.backtrace)
     exit 1
diff --git a/src/vnm_mad/remotes/fw/post b/src/vnm_mad/remotes/fw/post
index 17f301150c..641523838e 100755
--- a/src/vnm_mad/remotes/fw/post
+++ b/src/vnm_mad/remotes/fw/post
@@ -16,8 +16,8 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-$: << File.dirname(__FILE__)
-$: << File.join(File.dirname(__FILE__), "..")
+$LOAD_PATH << File.dirname(__FILE__)
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..')
 
 require 'vnmmad'
 
@@ -32,7 +32,7 @@ begin
     filter_driver.activate_vf(filter_driver.vm)
 
     filter_driver.run_hooks(ARGV, template64) if filter_driver.activate == 0
-rescue Exception => e
+rescue StandardError => e
     OpenNebula.log_error(e.message)
     OpenNebula.log_error(e.backtrace)
     exit 1
diff --git a/src/vnm_mad/remotes/fw/pre b/src/vnm_mad/remotes/fw/pre
index f4d3420489..566a2b2396 100755
--- a/src/vnm_mad/remotes/fw/pre
+++ b/src/vnm_mad/remotes/fw/pre
@@ -16,8 +16,8 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-$: << File.dirname(__FILE__)
-$: << File.join(File.dirname(__FILE__), "..")
+$LOAD_PATH << File.dirname(__FILE__)
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..')
 
 require 'vnmmad'