diff --git a/storage/emc/vplex/restapi/mode/clustercommunication.pm b/storage/emc/vplex/restapi/mode/clustercommunication.pm
index dece80664..b1f768268 100644
--- a/storage/emc/vplex/restapi/mode/clustercommunication.pm
+++ b/storage/emc/vplex/restapi/mode/clustercommunication.pm
@@ -91,6 +91,9 @@ sub run {
     my ($self, %options) = @_;
     my $vplex = $options{custom};
     
+    $self->{output}->output_add(severity => 'OK',
+                                short_msg => 'All Cluster Witness components are OK');
+    
     my $urlbase = '/vplex/cluster-witness/components/';     
     my $items = $vplex->get_items(url => $urlbase);
     foreach my $name (sort keys %{$items}) {
diff --git a/storage/emc/vplex/restapi/mode/clusterdevices.pm b/storage/emc/vplex/restapi/mode/clusterdevices.pm
index 6d94d8179..4ccdfae3c 100644
--- a/storage/emc/vplex/restapi/mode/clusterdevices.pm
+++ b/storage/emc/vplex/restapi/mode/clusterdevices.pm
@@ -110,7 +110,7 @@ sub run {
                                                             $instance, 
                                                             $items->{$cluster_name}->{$device_name}->{'health-state'}));
 
-            my $exit = $self->get_severity(section => 'volume_health', instance => $instance, value => $items->{$cluster_name}->{$device_name}->{'health-state'});
+            my $exit = $self->get_severity(section => 'device_health', instance => $instance, value => $items->{$cluster_name}->{$device_name}->{'health-state'});
             if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
                 $self->{output}->output_add(severity => $exit,
                                             short_msg => sprintf("Device '%s' health state is '%s'",