diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index ecefa96c..b1ed5869 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -430,9 +430,17 @@ class DiskObj():
 
     # Check for attributes
     if KEY_NVME in self.smartctl:
-      self.nvme_attributes = {
-        k: {'name': k, 'raw': int(v), 'raw_str': str(v)}
-        for k, v in self.smartctl[KEY_NVME].items()}
+      self.nvme_attributes = {}
+      for k, v in self.smartctl[KEY_NVME].items():
+        try:
+          self.nvme_attributes[k] = {
+            'name': k,
+            'raw': int(v),
+            'raw_str': str(v),
+            }
+        except Exception:
+          # TODO: Limit this check
+          pass
     elif KEY_SMART in self.smartctl:
       for a in self.smartctl[KEY_SMART].get('table', {}):
         try:
diff --git a/.linux_items/include/airootfs/etc/skel/.vimrc b/.linux_items/include/airootfs/etc/skel/.vimrc
index d65c6a91..aefcef8a 100644
--- a/.linux_items/include/airootfs/etc/skel/.vimrc
+++ b/.linux_items/include/airootfs/etc/skel/.vimrc
@@ -54,11 +54,15 @@ endif
 " 2Shirt Stuff
 set autoindent    " align the new line indent with the previous line
 set expandtab     " insert spaces when hitting TABs
+set nowrap        " I'd rather manually wrap than manually unwrap
 set shiftround    " round indent to multiple of 'shiftwidth'
-set shiftwidth=4  " operation >> indents 4 columns; << unindents 4 columns
-set softtabstop=4 " insert/delete 4 spaces when hitting a TAB/BACKSPACE
-set tabstop=4     " an hard TAB displays as 4 columns
+set shiftwidth=2  " operation >> indents 2 columns; << unindents 2 columns
+set softtabstop=2 " insert/delete 2 spaces when hitting a TAB/BACKSPACE
+set tabstop=2     " an hard TAB displays as 2 columns
 
 " Python Stuff.
 au FileType python set textwidth=79  " lines longer than 79 columns will be broken
 
+" Do wrap stuff
+au FileType text set wrap
+