diff --git a/storage/quantum/dxi/ssh/mode/compaction.pm b/storage/quantum/dxi/ssh/mode/compaction.pm
index 647f36a2a..ff1eadb65 100644
--- a/storage/quantum/dxi/ssh/mode/compaction.pm
+++ b/storage/quantum/dxi/ssh/mode/compaction.pm
@@ -193,7 +193,7 @@ sub check_options {
     $self->SUPER::check_options(%options);
 
     if (defined($self->{option_results}->{hostname}) && $self->{option_results}->{hostname} ne '') {
-       $self->{option_results}->{remote} = 1;
+        $self->{option_results}->{remote} = 1;
     }
 
     $instance_mode = $self;
diff --git a/storage/quantum/dxi/ssh/mode/diskusage.pm b/storage/quantum/dxi/ssh/mode/diskusage.pm
index 95becbad1..81eeb036d 100644
--- a/storage/quantum/dxi/ssh/mode/diskusage.pm
+++ b/storage/quantum/dxi/ssh/mode/diskusage.pm
@@ -242,7 +242,7 @@ sub check_options {
     $self->SUPER::check_options(%options);
 
     if (defined($self->{option_results}->{hostname}) && $self->{option_results}->{hostname} ne '') {
-       $self->{option_results}->{remote} = 1;
+        $self->{option_results}->{remote} = 1;
     }
     
     $instance_mode = $self;
diff --git a/storage/quantum/dxi/ssh/mode/health.pm b/storage/quantum/dxi/ssh/mode/health.pm
index 4d22c8d09..d4e170632 100644
--- a/storage/quantum/dxi/ssh/mode/health.pm
+++ b/storage/quantum/dxi/ssh/mode/health.pm
@@ -119,7 +119,7 @@ sub new {
 sub change_macros {
     my ($self, %options) = @_;
 
-    foreach ('warning_status', 'critical_status') {
+    foreach (('warning_status', 'critical_status')) {
         if (defined($self->{option_results}->{$_})) {
             $self->{option_results}->{$_} =~ s/%\{(.*?)\}/\$self->{result_values}->{$1}/g;
         }
@@ -129,6 +129,10 @@ sub change_macros {
 sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
+
+    if (defined($self->{option_results}->{hostname}) && $self->{option_results}->{hostname} ne '') {
+        $self->{option_results}->{remote} = 1;
+    }
     
     $instance_mode = $self;
     $self->change_macros();
diff --git a/storage/quantum/dxi/ssh/mode/hostbusadapterstatus.pm b/storage/quantum/dxi/ssh/mode/hostbusadapterstatus.pm
index 50227c723..11bec450e 100644
--- a/storage/quantum/dxi/ssh/mode/hostbusadapterstatus.pm
+++ b/storage/quantum/dxi/ssh/mode/hostbusadapterstatus.pm
@@ -128,6 +128,10 @@ sub change_macros {
 sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
+
+    if (defined($self->{option_results}->{hostname}) && $self->{option_results}->{hostname} ne '') {
+        $self->{option_results}->{remote} = 1;
+    }
     
     $instance_mode = $self;
     $self->change_macros();
diff --git a/storage/quantum/dxi/ssh/mode/memory.pm b/storage/quantum/dxi/ssh/mode/memory.pm
index a407f51c4..dbce15d88 100644
--- a/storage/quantum/dxi/ssh/mode/memory.pm
+++ b/storage/quantum/dxi/ssh/mode/memory.pm
@@ -152,7 +152,7 @@ sub check_options {
     $self->SUPER::check_options(%options);
 
     if (defined($self->{option_results}->{hostname}) && $self->{option_results}->{hostname} ne '') {
-       $self->{option_results}->{remote} = 1;
+        $self->{option_results}->{remote} = 1;
     }
     
     $instance_mode = $self;
diff --git a/storage/quantum/dxi/ssh/mode/network.pm b/storage/quantum/dxi/ssh/mode/network.pm
index fc8f5dc05..d57163ebf 100644
--- a/storage/quantum/dxi/ssh/mode/network.pm
+++ b/storage/quantum/dxi/ssh/mode/network.pm
@@ -119,7 +119,7 @@ sub new {
 sub change_macros {
     my ($self, %options) = @_;
 
-    foreach ('warning_status', 'critical_status') {
+    foreach (('warning_status', 'critical_status')) {
         if (defined($self->{option_results}->{$_})) {
             $self->{option_results}->{$_} =~ s/%\{(.*?)\}/\$self->{result_values}->{$1}/g;
         }
@@ -129,6 +129,10 @@ sub change_macros {
 sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
+
+    if (defined($self->{option_results}->{hostname}) && $self->{option_results}->{hostname} ne '') {
+        $self->{option_results}->{remote} = 1;
+    }
     
     $instance_mode = $self;
     $self->change_macros();
diff --git a/storage/quantum/dxi/ssh/mode/reclamation.pm b/storage/quantum/dxi/ssh/mode/reclamation.pm
index e74d3837b..e53bbc21e 100644
--- a/storage/quantum/dxi/ssh/mode/reclamation.pm
+++ b/storage/quantum/dxi/ssh/mode/reclamation.pm
@@ -202,7 +202,7 @@ sub check_options {
     $self->SUPER::check_options(%options);
 
     if (defined($self->{option_results}->{hostname}) && $self->{option_results}->{hostname} ne '') {
-       $self->{option_results}->{remote} = 1;
+        $self->{option_results}->{remote} = 1;
     }
 
     $instance_mode = $self;
diff --git a/storage/quantum/dxi/ssh/mode/reduction.pm b/storage/quantum/dxi/ssh/mode/reduction.pm
index 3b63668b5..a67a14741 100644
--- a/storage/quantum/dxi/ssh/mode/reduction.pm
+++ b/storage/quantum/dxi/ssh/mode/reduction.pm
@@ -217,7 +217,7 @@ sub check_options {
     $self->SUPER::check_options(%options);
 
     if (defined($self->{option_results}->{hostname}) && $self->{option_results}->{hostname} ne '') {
-       $self->{option_results}->{remote} = 1;
+        $self->{option_results}->{remote} = 1;
     }
     
     $instance_mode = $self;
diff --git a/storage/quantum/dxi/ssh/mode/storagearraystatus.pm b/storage/quantum/dxi/ssh/mode/storagearraystatus.pm
index d12ef425d..715a77f8e 100644
--- a/storage/quantum/dxi/ssh/mode/storagearraystatus.pm
+++ b/storage/quantum/dxi/ssh/mode/storagearraystatus.pm
@@ -118,7 +118,7 @@ sub new {
 sub change_macros {
     my ($self, %options) = @_;
 
-    foreach ('warning_status', 'critical_status') {
+    foreach (('warning_status', 'critical_status')) {
         if (defined($self->{option_results}->{$_})) {
             $self->{option_results}->{$_} =~ s/%\{(.*?)\}/\$self->{result_values}->{$1}/g;
         }
@@ -128,6 +128,10 @@ sub change_macros {
 sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
+
+    if (defined($self->{option_results}->{hostname}) && $self->{option_results}->{hostname} ne '') {
+        $self->{option_results}->{remote} = 1;
+    }
     
     $instance_mode = $self;
     $self->change_macros();
diff --git a/storage/quantum/dxi/ssh/mode/systemstatus.pm b/storage/quantum/dxi/ssh/mode/systemstatus.pm
index f329e4bfb..0f637a965 100644
--- a/storage/quantum/dxi/ssh/mode/systemstatus.pm
+++ b/storage/quantum/dxi/ssh/mode/systemstatus.pm
@@ -120,7 +120,7 @@ sub new {
 sub change_macros {
     my ($self, %options) = @_;
 
-    foreach ('warning_status', 'critical_status') {
+    foreach (('warning_status', 'critical_status')) {
         if (defined($self->{option_results}->{$_})) {
             $self->{option_results}->{$_} =~ s/%\{(.*?)\}/\$self->{result_values}->{$1}/g;
         }
@@ -130,6 +130,10 @@ sub change_macros {
 sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
+
+    if (defined($self->{option_results}->{hostname}) && $self->{option_results}->{hostname} ne '') {
+        $self->{option_results}->{remote} = 1;
+    }
     
     $instance_mode = $self;
     $self->change_macros();
diff --git a/storage/quantum/dxi/ssh/mode/throughput.pm b/storage/quantum/dxi/ssh/mode/throughput.pm
index c13c69596..f5da1c4cb 100644
--- a/storage/quantum/dxi/ssh/mode/throughput.pm
+++ b/storage/quantum/dxi/ssh/mode/throughput.pm
@@ -136,7 +136,7 @@ sub check_options {
     $self->SUPER::check_options(%options);
 
     if (defined($self->{option_results}->{hostname}) && $self->{option_results}->{hostname} ne '') {
-       $self->{option_results}->{remote} = 1;
+        $self->{option_results}->{remote} = 1;
     }
 
     $instance_mode = $self;
diff --git a/storage/quantum/dxi/ssh/plugin.pm b/storage/quantum/dxi/ssh/plugin.pm
index ed46d1793..da00b5bb8 100644
--- a/storage/quantum/dxi/ssh/plugin.pm
+++ b/storage/quantum/dxi/ssh/plugin.pm
@@ -33,8 +33,8 @@ sub new {
     %{$self->{modes}} = (
                             'compaction'                => 'storage::quantum::dxi::ssh::mode::compaction',
                             'disk-usage'                => 'storage::quantum::dxi::ssh::mode::diskusage',
-                            'hostbus-adapter-status'    => 'storage::quantum::dxi::ssh::mode::hostbusadapterstatus',
                             'health'                    => 'storage::quantum::dxi::ssh::mode::health',
+                            'hostbus-adapter-status'    => 'storage::quantum::dxi::ssh::mode::hostbusadapterstatus',
                             'memory'                    => 'storage::quantum::dxi::ssh::mode::memory',
                             'network'                   => 'storage::quantum::dxi::ssh::mode::network',
                             'reclamation'               => 'storage::quantum::dxi::ssh::mode::reclamation',