diff --git a/internal/view/node.go b/internal/view/node.go
index 9cce2783..63011832 100644
--- a/internal/view/node.go
+++ b/internal/view/node.go
@@ -151,7 +151,7 @@ func (n *Node) sshCmd(evt *tcell.EventKey) *tcell.EventKey {
 	defer n.Start()
 	_, node := client.Namespaced(path)
 	if err := ssh(n.App(), node); err != nil {
-		log.Error().Err(err).Msgf("SSH Failed")
+		log.Error().Err(err).Msgf("Node Shell Failed")
 	}
 
 	return nil
diff --git a/internal/view/pod.go b/internal/view/pod.go
index 6e3ef712..a526b0cc 100644
--- a/internal/view/pod.go
+++ b/internal/view/pod.go
@@ -522,26 +522,26 @@ func getPodOS(f dao.Factory, fqn string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	if os, ok := osFromSelector(po.Spec.NodeSelector); ok {
-		return os, nil
+	if podOS, ok := osFromSelector(po.Spec.NodeSelector); ok {
+		return podOS, nil
 	}
 
-	no, err := dao.FetchNode(context.Background(), f, po.Spec.Hostname)
+	node, err := dao.FetchNode(context.Background(), f, po.Spec.NodeName)
 	if err == nil {
-		if os, ok := osFromSelector(no.Labels); ok {
-			return os, nil
+		if nodeOS, ok := osFromSelector(node.Labels); ok {
+			return nodeOS, nil
 		}
 	}
 
-	return "", fmt.Errorf("no os information available")
+	return "", errors.New("no os information available")
 }
 
 func osFromSelector(s map[string]string) (string, bool) {
 	if os, ok := s[osBetaSelector]; ok {
 		return os, ok
 	}
-	os, ok := s[osSelector]
 
+	os, ok := s[osSelector]
 	return os, ok
 }