diff --git a/inxi b/inxi
index 6266dff..cb1b629 100755
--- a/inxi
+++ b/inxi
@@ -1891,7 +1891,7 @@ debug_data_collector()
 			gpart list &> $debug_data_dir/bsd-gpart-list.txt
 			gpart show &> $debug_data_dir/bsd-gpart-show.txt
 			gpart status &> $debug_data_dir/bsd-gpart-status.txt
-			swapctl -l &> $debug_data_dir/bsd-swapctl-l.txt
+			swapctl -l -k &> $debug_data_dir/bsd-swapctl-l-k.txt
 			swapon -s &> $debug_data_dir/swapon-s.txt
 			sysctl -b kern.geom.conftxt  &> $debug_data_dir/bsd-sysctl-b-kern.geom.conftxt.txt
 			sysctl -b kern.geom.confxml &> $debug_data_dir/bsd-sysctl-b-kern.geom.confxml.txt
@@ -5776,8 +5776,8 @@ get_hdd_data_basic()
 		else
 			df_string='df -k'
 		fi
-		if swapctl -l &>/dev/null;then
-			swap_size=$( swapctl -l 2>/dev/null | gawk '
+		if swapctl -l -k &>/dev/null;then
+			swap_size=$( swapctl -l -k 2>/dev/null | gawk '
 			BEGIN { 
 			swapSize=0
 			total=0
@@ -7493,7 +7493,7 @@ get_partition_data()
 		--exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs
 		--exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs'
 	else
-		swap_data="$( swapctl -l 2>/dev/null )"
+		swap_data="$( swapctl -l -k 2>/dev/null )"
 		# default size is 512, -H only for size in human readable format
 		# older bsds don't support -T, pain, so we'll use partial output there
 		if df -h -T &>/dev/null;then
@@ -8473,6 +8473,7 @@ get_raid_data_bsd()
 		/SIZE.*ALLOC/ {
 			sub(/.*ALLOC.*/,"", $0)
 		}
+		# gptid/d874c7e7-3f6d-11e4-b7dc-080027ea466c
 		/^[^[:space:]]/ {
 			components=""
 			separator=""