diff --git a/WHATS_NEW b/WHATS_NEW
index 8b2a5303e..1bb591b84 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.01.10 - 
 ================================
+  Alignment tidying.
 
 Version 2.01.09 - 4th April 2005
 ================================
diff --git a/lib/cache/lvmcache.h b/lib/cache/lvmcache.h
index d139bbd79..a748b9393 100644
--- a/lib/cache/lvmcache.h
+++ b/lib/cache/lvmcache.h
@@ -36,9 +36,10 @@ struct volume_group;
 struct lvmcache_vginfo {
 	struct list list;	/* Join these vginfos together */
 	struct list infos;	/* List head for lvmcache_infos */
+	const struct format_type *fmt;
 	char *vgname;		/* "" == orphan */
 	char vgid[ID_LEN + 1];
-	const struct format_type *fmt;
+	char _padding[7];
 };
 
 struct lvmcache_info {
diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h
index 34606f1f9..b72a2ce76 100644
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -32,17 +32,15 @@ struct config_info {
 	int syslog;
 	int activation;
 	int suffix;
-	uint64_t unit_factor;
-	char unit_type;
-	const char *msg_prefix;
-	int cmd_name;		/* Show command name? */
-
 	int archive;		/* should we archive ? */
 	int backup;		/* should we backup ? */
-
+	const char *msg_prefix;
 	struct format_type *fmt;
-
+	uint64_t unit_factor;
+	int cmd_name;		/* Show command name? */
 	mode_t umask;
+	char unit_type;
+	char _padding[1];
 };
 
 struct config_tree;
diff --git a/lib/device/device.h b/lib/device/device.h
index 9bb56603e..ac7bd955e 100644
--- a/lib/device/device.h
+++ b/lib/device/device.h
@@ -41,6 +41,7 @@ struct device {
 	struct list open_list;
 
 	char pvid[ID_LEN + 1];
+	char _padding[7];
 };
 
 struct device_list {
diff --git a/lib/report/report.c b/lib/report/report.c
index 6b6666675..af5068289 100644
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -855,9 +855,9 @@ static int _copypercent_disp(struct report_handle *rh, struct field *field,
 
 static struct {
 	report_type_t type;
-	const char id[30];
+	const char id[32];
 	off_t offset;
-	const char heading[30];
+	const char heading[32];
 	int width;
 	uint32_t flags;
 	field_report_fn report_fn;
diff --git a/lib/uuid/uuid.h b/lib/uuid/uuid.h
index 2dc157fbc..fcef414b4 100644
--- a/lib/uuid/uuid.h
+++ b/lib/uuid/uuid.h
@@ -25,11 +25,11 @@ struct id {
 
 /*
  * Unique logical volume identifier
- * With format1 this is VG uuid + LV uuid + '\0'
+ * With format1 this is VG uuid + LV uuid + '\0' + padding
  */
 union lvid {
 	struct id id[2];
-	char s[2 * sizeof(struct id) + 1];
+	char s[2 * sizeof(struct id) + 1 + 7];
 };
 
 int lvid_from_lvnum(union lvid *lvid, struct id *vgid, uint32_t lv_num);
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 9cd794191..237777936 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -54,7 +54,7 @@ extern char *optarg;
  */
 struct arg the_args[ARG_COUNT + 1] = {
 
-#define arg(a, b, c, d) {b, "--" c, d, 0, NULL, 0, 0, INT64_C(0), UINT64_C(0), 0, NULL},
+#define arg(a, b, c, d) {b, "", "--" c, d, 0, NULL, 0, 0, INT64_C(0), UINT64_C(0), 0, NULL},
 #include "args.h"
 #undef arg
 
diff --git a/tools/tools.h b/tools/tools.h
index c6b8a7ce3..00afbadd3 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -89,7 +89,9 @@ enum {
 /* a global table of possible arguments */
 struct arg {
 	const char short_arg;
+	char _padding[7];
 	const char *long_arg;
+
 	int (*fn) (struct cmd_context * cmd, struct arg * a);
 
 	unsigned int count;