   *
   * $Id$
   */
+diff --git a/src/modules/StorageFields.ycp b/src/modules/StorageFields.ycp
+index 5aca433..9607b07 100644
+--- a/src/modules/StorageFields.ycp
++++ b/src/modules/StorageFields.ycp
+@@ -86,20 +86,20 @@ global string UsedByString(map<string, any> used_by)
+ 	switch (type)
+ 	{
+ 	    case `UB_LVM:
+-		return "LVM " + device;
++		return "LVM " + device; break;
+ 	    case `UB_DM:
+-		return "DM " + device;
++		return "DM " + device; break;
+ 	    case `UB_DMRAID:
+-		return "DM RAID " + device;
++		return "DM RAID " + device; break;
+ 	    case `UB_DMMULTIPATH:
+-		return "DM Multipath " + device;
++		return "DM Multipath " + device; break;
+ 	    case `UB_MD:
+ 	    case `UB_MDPART:
+-		return "MD RAID " + device;
++		return "MD RAID " + device; break;
+ 	    case `UB_BTRFS:
+-		return "BTRFS " + device;
++		return "BTRFS " + device; break;
+ 	    default:
+-		return device;
++		return device; break;
+ 	}
+     }
+ 
+@@ -1318,25 +1318,25 @@ Identifier of the file system.");
+ 	    switch (field) {
+ 		case `heading_device:
+ 		    // heading
+-		    return _("Device:");
++		    return _("Device:"); break;
+ 		case `heading_filesystem:
+ 		    // heading
+-		    return _("File System:");
++		    return _("File System:"); break;
+ 		case `heading_hd:
+ 		    // heading
+-		    return _("Hard Disk:");
++		    return _("Hard Disk:"); break;
+ 		case `heading_fc:
+ 		    // heading
+-		    return _("Fibre Channel:");
++		    return _("Fibre Channel:"); break;
+ 		case `heading_lvm:
+ 		    // heading
+-		    return _("LVM:");
++		    return _("LVM:"); break;
+ 		case `heading_md:
+ 		    // heading
+-		    return _("RAID:");
++		    return _("RAID:"); break;
+ 		default:
+ 		    y2error("unknown field %1", field);
+-		    return "error";
++		    return "error"; break;
+ 	    }
+ 	}
+ 
+diff --git a/src/modules/StorageIcons.ycp b/src/modules/StorageIcons.ycp
+index f52706f..968ac05 100644
+--- a/src/modules/StorageIcons.ycp
++++ b/src/modules/StorageIcons.ycp
+@@ -69,36 +69,45 @@
+ 	    case `CT_MDPART:
+ 	    case `sw_raid:
+ 		return raid_icon;
++    break;
+ 
+ 	    case `CT_DMMULTIPATH:
+ 	    case `CT_DM:
+ 	    case `dm:
+ 		return dm_icon;
++    break;
+ 
+ 	    case `CT_DISK:
+ 		return hd_icon;
++    break;
+ 
+ 	    case `CT_LOOP:
+ 	    case `loop:
+ 		return loop_icon;
++    break;
+ 
+ 	    case `CT_LVM:
+ 		return lvm_icon;
++    break;
+ 
+ 	    case `lvm:
+ 		return lvm_lv_icon;
++    break;
+ 
+ 	    case `CT_NFS:
+ 	    case `nfs:
+ 		return nfs_icon;
++    break;
+ 
+ 	    case `primary:
+ 	    case `logical:
+ 	    case `extended:
+ 		return hd_part_icon;
++    break;
+ 
+ 	    default:
+ 		return "yast-hdd-controller-kernel-module.png";
++    break;
+ 	}
+     }
+ 

 
     
diff --git a/src/include/partitioning/auto_part_prepare.ycp b/src/include/partitioning/auto_part_prepare.ycp
index 32109d5..e04f150 100644
--- a/src/include/partitioning/auto_part_prepare.ycp
+++ b/src/include/partitioning/auto_part_prepare.ycp
@@ -23,7 +23,7 @@

diff --git a/src/include/partitioning/auto_part_create.ycp b/src/include/partitioning/auto_part_create.ycp
index a2a68e6..7e81d58 100644
--- a/src/include/partitioning/auto_part_create.ycp
+++ b/src/include/partitioning/auto_part_create.ycp
@@ -23,7 +23,7 @@
